ソースを参照

Merge branch 'master' of https://github.com/civetweb/civetweb

bel2125 5 年 前
コミット
f26b5fdfcb
2 ファイル変更2 行追加1 行削除
  1. 1 0
      docs/api/mg_callbacks.md
  2. 1 1
      src/civetweb.c

+ 1 - 0
docs/api/mg_callbacks.md

@@ -33,6 +33,7 @@
 | |**0** - The master thread is created |
 | |**0** - The master thread is created |
 | |**1** - A worker thread which handles client connections has been created|
 | |**1** - A worker thread which handles client connections has been created|
 | |**2** - An internal helper thread (timer thread) has been created|
 | |**2** - An internal helper thread (timer thread) has been created|
+| |**3** - A websocket client thread has been created|
 | |The returned `void *` is stored as user defined pointer in the thread local storage.|
 | |The returned `void *` is stored as user defined pointer in the thread local storage.|
 |**`exit_thread`**|**`void (*exit_thread)( const struct mg_context *ctx, int thread_type, void * user_ptr);`**|
 |**`exit_thread`**|**`void (*exit_thread)( const struct mg_context *ctx, int thread_type, void * user_ptr);`**|
 | |The callback function `exit_thread()` is called when a thread is about to exit. The parameters correspond to `init_thread`, with `user_ptr` being the return value.|
 | |The callback function `exit_thread()` is called when a thread is about to exit. The parameters correspond to `init_thread`, with `user_ptr` being the return value.|

+ 1 - 1
src/civetweb.c

@@ -59,7 +59,7 @@
 #if defined(__linux__) && !defined(_XOPEN_SOURCE)
 #if defined(__linux__) && !defined(_XOPEN_SOURCE)
 #define _XOPEN_SOURCE 600 /* For flockfile() on Linux */
 #define _XOPEN_SOURCE 600 /* For flockfile() on Linux */
 #endif
 #endif
-#if defined(__LSB_VERSION__)
+#if defined(__LSB_VERSION__) || defined(__sun)
 #define NEED_TIMEGM
 #define NEED_TIMEGM
 #define NO_THREAD_NAME
 #define NO_THREAD_NAME
 #endif
 #endif