thread-win32.patch
| b/src/http/WServer.C | ||
|---|---|---|
| 276 | 276 |
{
|
| 277 | 277 |
#ifndef WIN32 |
| 278 | 278 |
char *path = realpath(argv[0], 0); |
| 279 |
#else |
|
| 280 |
char *path = argv[0]; |
|
| 281 |
#endif |
|
| 282 | 279 | |
| 283 | 280 |
// Try a few times since this may fail because we have an incomplete |
| 284 | 281 |
// binary... |
| ... | ... | |
| 292 | 289 |
#endif |
| 293 | 290 |
} |
| 294 | 291 |
perror("execve");
|
| 292 |
#endif |
|
| 295 | 293 |
} |
| 296 | 294 | |
| 297 | 295 |
void WServer::handleRequest(WebRequest *request) |
| ... | ... | |
| 363 | 361 |
return 0; |
| 364 | 362 | |
| 365 | 363 |
#endif // WIN32 |
| 366 | ||
| 364 |
#else |
|
| 365 |
return 0; |
|
| 367 | 366 |
#endif // WT_THREADED |
| 368 | 367 |
} |
| 369 | 368 | |
| ... | ... | |
| 391 | 390 |
server.setServerConfiguration(argc, argv, WTHTTP_CONFIGURATION); |
| 392 | 391 |
server.addEntryPoint(Application, createApplication); |
| 393 | 392 |
if (server.start()) {
|
| 393 |
#ifdef WT_THREADED |
|
| 394 | 394 |
int sig = WServer::waitForShutdown(argv[0]); |
| 395 | 395 |
server.impl()->serverConfiguration_.log("notice")
|
| 396 | 396 |
<< "Shutdown (signal = " << sig << ")"; |
| 397 |
#endif |
|
| 397 | 398 |
server.stop(); |
| 398 | 399 |
#ifndef WIN32 |
| 399 | 400 |
if (sig == SIGHUP) |
| b/src/isapi/CMakeLists.txt | ||
|---|---|---|
| 1 | 1 |
IF(CONNECTOR_ISAPI) |
| 2 |
MESSAGE("** Enabling ISAPI.")
|
|
| 2 |
IF(NOT MULTI_THREADED) |
|
| 3 |
MESSAGE("** Disabling ISAPI because MULTI_THREADED is disabled.")
|
|
| 4 |
ELSE(NOT MULTI_THREADED) |
|
| 5 |
MESSAGE("** Enabling ISAPI.")
|
|
| 3 | 6 | |
| 4 |
ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) |
|
| 7 |
ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) |
|
| 5 | 8 | |
| 6 |
SET(libsapisources |
|
| 7 |
Server.C |
|
| 8 |
Isapi.C |
|
| 9 |
IsapiRequest.C |
|
| 10 |
IsapiStream.C |
|
| 11 |
) |
|
| 9 |
SET(libsapisources |
|
| 10 |
Server.C |
|
| 11 |
Isapi.C |
|
| 12 |
IsapiRequest.C |
|
| 13 |
IsapiStream.C |
|
| 14 |
) |
|
| 12 | 15 | |
| 13 |
INCLUDE_DIRECTORIES(${FCGI_INCLUDE_DIRS})
|
|
| 14 |
ADD_LIBRARY(wtisapi ${libsapisources})
|
|
| 15 |
TARGET_LINK_LIBRARIES(wtisapi wt) |
|
| 16 |
INCLUDE_DIRECTORIES(${FCGI_INCLUDE_DIRS})
|
|
| 17 |
ADD_LIBRARY(wtisapi ${libsapisources})
|
|
| 18 |
TARGET_LINK_LIBRARIES(wtisapi wt) |
|
| 16 | 19 | |
| 17 |
SET_TARGET_PROPERTIES( |
|
| 18 |
wtisapi |
|
| 19 |
PROPERTIES |
|
| 20 |
VERSION ${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}
|
|
| 21 |
SOVERSION ${WTISAPI_SOVERSION}
|
|
| 22 |
DEBUG_POSTFIX "d" |
|
| 23 |
) |
|
| 20 |
SET_TARGET_PROPERTIES( |
|
| 21 |
wtisapi |
|
| 22 |
PROPERTIES |
|
| 23 |
VERSION ${VERSION_SERIES}.${VERSION_MAJOR}.${VERSION_MINOR}
|
|
| 24 |
SOVERSION ${WTISAPI_SOVERSION}
|
|
| 25 |
DEBUG_POSTFIX "d" |
|
| 26 |
) |
|
| 24 | 27 | |
| 25 |
INSTALL(TARGETS wtisapi |
|
| 26 |
RUNTIME DESTINATION bin |
|
| 27 |
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
| 28 |
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
| 28 |
INSTALL(TARGETS wtisapi |
|
| 29 |
RUNTIME DESTINATION bin |
|
| 30 |
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
| 31 |
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
| 32 |
ENDIF(NOT MULTI_THREADED) |
|
| 29 | 33 |
ELSE(CONNECTOR_ISAPI) |
| 30 | 34 |
MESSAGE("** Disabling ISAPI.")
|
| 31 | 35 |
ENDIF(CONNECTOR_ISAPI) |