Software /
code /
prosody
Annotate
util-src/Makefile.win @ 8791:8da11142fabf
muc: Allow clients to change multiple affiliations or roles at once (#345)
According to XEP-0045 sections 9.2, 9.5 and 9.8 affiliation lists and role
lists should allow mass-modification. Prosody however would just use the
first entry of the list and ignore the rest. This is fixed by introducing
a `for` loop to `set` stanzas of the respective `muc#admin` namespace.
In order for this loop to work, the error handling was changed a little.
Prosody no longer returns after the first error. Instead, an error reply
is sent for each malformed or otherwise wrong entry, but the loop keeps
going over the other entries. This may lead to multiple error messages
being sent for one client request. A notable exception from this is when
the XML Schema for `muc#admin` requests is violated. In that case the loop
is aborted with an error message to the client.
The change is a bit bigger than that in order to have the loop only for
`set` stanzas without changing the behaviour of the `get` stanzas. This is
now more in line with trunk, where there are separate methods for each
stanza type.
References: #345
author | Lennart Sauerbeck <devel@lennart.sauerbeck.org> |
---|---|
date | Sat, 18 Mar 2017 18:47:28 +0100 |
parent | 2063:e89594a1bf4a |
rev | line source |
---|---|
442
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
1 |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
2 LUA_PATH=$(LUA_DEV) |
1830
dc4d47d91d66
Makefile.win: Updated the windows Makefile with more appropriate paths.
Waqas Hussain <waqas20@gmail.com>
parents:
442
diff
changeset
|
3 IDN_PATH=..\..\libidn-1.15 |
dc4d47d91d66
Makefile.win: Updated the windows Makefile with more appropriate paths.
Waqas Hussain <waqas20@gmail.com>
parents:
442
diff
changeset
|
4 OPENSSL_PATH=..\..\openssl-0.9.8k |
442
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
5 |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
6 LUA_INCLUDE=$(LUA_PATH)\include |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
7 LUA_LIB=$(LUA_PATH)\lib\lua5.1.lib |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
8 |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
9 IDN_LIB=$(IDN_PATH)\win32\lib\libidn.lib |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
10 IDN_INCLUDE1=$(IDN_PATH)\lib |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
11 IDN_INCLUDE2=$(IDN_PATH)\win32\include |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
12 OPENSSL_LIB=$(OPENSSL_PATH)\out32dll\libeay32.lib |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
13 OPENSSL_INCLUDE=$(OPENSSL_PATH)\include |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
14 |
2063
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
15 CL=cl /LD /MD /nologo |
442
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
16 |
2063
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
17 all: encodings.dll hashes.dll windows.dll |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
18 |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
19 install: encodings.dll hashes.dll windows.dll |
442
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
20 copy /Y *.dll ..\util\ |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
21 |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
22 clean: |
2063
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
23 del encodings.dll encodings.exp encodings.lib encodings.obj encodings.dll.manifest |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
24 del hashes.dll hashes.exp hashes.lib hashes.obj hashes.dll.manifest |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
25 del windows.dll windows.exp windows.lib windows.obj windows.dll.manifest |
442
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
26 |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
27 encodings.dll: encodings.c |
2063
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
28 $(CL) encodings.c /I"$(LUA_INCLUDE)" /I"$(IDN_INCLUDE1)" /I"$(IDN_INCLUDE2)" /link "$(LUA_LIB)" "$(IDN_LIB)" /export:luaopen_util_encodings |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
29 del encodings.exp encodings.lib encodings.obj encodings.dll.manifest |
442
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
30 |
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
31 hashes.dll: hashes.c |
2063
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
32 $(CL) hashes.c /I"$(LUA_INCLUDE)" /I"$(OPENSSL_INCLUDE)" /link "$(LUA_LIB)" "$(OPENSSL_LIB)" /export:luaopen_util_hashes |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
33 del hashes.exp hashes.lib hashes.obj hashes.dll.manifest |
442
722f63c70a77
Makefile now works on windows with Microsoft's compiler
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
34 |
2063
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
35 windows.dll: windows.c |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
36 $(CL) windows.c /I"$(LUA_INCLUDE)" /link "$(LUA_LIB)" dnsapi.lib /export:luaopen_util_windows |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
37 del windows.exp windows.lib windows.obj windows.dll.manifest |
e89594a1bf4a
Makefile.win: Added support for util.windows, improved cleanup of temporary files, switched to dynamic linking with MSVCRT, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1830
diff
changeset
|
38 |