Mercurial > hg > nginx
comparison src/core/ngx_string.c @ 3102:4b5cf483c6a8 stable-0.7
merge r3047, r3048, r3049:
twice termination delay only after SIGALRM, otherwise many separate SIGCHLD
and SIGIO signals quickly increase delay to the level when SIGKILL is sent
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 07 Sep 2009 11:31:20 +0000 |
| parents | 819bea4e964e |
| children | 415400fa0f10 |
comparison
equal
deleted
inserted
replaced
| 3101:49272f5b45a6 | 3102:4b5cf483c6a8 |
|---|---|
| 85 * %c char | 85 * %c char |
| 86 * %% % | 86 * %% % |
| 87 * | 87 * |
| 88 * reserved: | 88 * reserved: |
| 89 * %t ptrdiff_t | 89 * %t ptrdiff_t |
| 90 * %S null-teminated wchar string | 90 * %S null-terminated wchar string |
| 91 * %C wchar | 91 * %C wchar |
| 92 */ | 92 */ |
| 93 | 93 |
| 94 | 94 |
| 95 u_char * ngx_cdecl | 95 u_char * ngx_cdecl |