Annotate

util-src/Makefile.win @ 13765:7c57fb2ffbb0 13.0

mod_websocket: Merge session close handling changes from mod_c2s (bug fixes) This should bring some fixes and general robustness that mod_websocket had missed out on. The duplicated code here is not at all ideal. To prevent this happening again, we should figure out how to have the common logic in a single place, while still being able to do the websocket-specific parts that we need. The main known bug that this fixes is that it's possible for a session to get into a non-destroyable state. For example, if we try to session:close() a hibernating session, then session.conn is nil and the function will simply return without doing anything. In the mod_c2s code we already handle this, and just destroy the session. But if a hibernating websocket session is never resumed or becomes non-resumable, it will become immortal! By merging the fix from mod_c2s, the session should now be correctly destroyed.
author Matthew Wild <mwild1@gmail.com>
date Tue, 11 Mar 2025 18:44:40 +0000
parent 2063:e89594a1bf4a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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