Mercurial > hg > nginx

comparison src/core/ngx_regex.c @ 3349:169d84ff4064

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix pcre allocation on Win32, the bug had been introduced in r3326
author Igor Sysoev <igor@sysoev.ru>
date Tue, 17 Nov 2009 10:24:45 +0000
parents 42c16d8bddbe
children 7423800ef437
comparison
equal deleted inserted replaced
3348:637d622486e1 3349:169d84ff4064
33 tls = ngx_thread_get_tls(ngx_core_tls_key); 33 tls = ngx_thread_get_tls(ngx_core_tls_key);
34 tls->pool = pool; 34 tls->pool = pool;
35 return; 35 return;
36 } 36 }
37 37
38 #else 38 #endif
39 39
40 ngx_pcre_pool = pool; 40 ngx_pcre_pool = pool;
41
42 #endif
43 } 41 }
44 42
45 43
46 static ngx_inline void 44 static ngx_inline void
47 ngx_regex_malloc_done(void) 45 ngx_regex_malloc_done(void)
53 tls = ngx_thread_get_tls(ngx_core_tls_key); 51 tls = ngx_thread_get_tls(ngx_core_tls_key);
54 tls->pool = NULL; 52 tls->pool = NULL;
55 return; 53 return;
56 } 54 }
57 55
58 #else 56 #endif
59 57
60 ngx_pcre_pool = NULL; 58 ngx_pcre_pool = NULL;
61
62 #endif
63 } 59 }
64 60
65 61
66 ngx_int_t 62 ngx_int_t
67 ngx_regex_compile(ngx_regex_compile_t *rc) 63 ngx_regex_compile(ngx_regex_compile_t *rc)