comparison src/core/ngx_regex.c @ 50:72eb30262aac NGINX_0_1_25

nginx 0.1.25 *) Bugfix: nginx did run on Linux parisc. *) Feature: nginx now does not start under FreeBSD if the sysctl kern.ipc.somaxconn value is too big. *) Bugfix: if a request was internally redirected by the ngx_http_index_module module to the ngx_http_proxy_module or ngx_http_fastcgi_module modules, then the index file was not closed after request completion. *) Feature: the "proxy_pass" can be used in location with regular expression. *) Feature: the ngx_http_rewrite_filter_module module supports the condition like "if ($HTTP_USER_AGENT ~ MSIE)". *) Bugfix: nginx started too slow if the large number of addresses and text values were used in the "geo" directive. *) Change: a variable name must be declared as "$name" in the "geo" directive. The previous variant without "$" is still supported, but will be removed soon. *) Feature: the "%{VARIABLE}v" logging parameter. *) Feature: the "set $name value" directive. *) Bugfix: gcc 4.0 compatibility. *) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
author Igor Sysoev <http://sysoev.ru>
date Sat, 19 Mar 2005 00:00:00 +0300
parents 6cfc63e68377
children 0d75d65c642f
comparison
equal deleted inserted replaced
49:93dabbc9efb9 50:72eb30262aac
77 77
78 return re; 78 return re;
79 } 79 }
80 80
81 81
82 ngx_uint_t ngx_regex_capture_count(ngx_regex_t *re) 82 ngx_int_t ngx_regex_capture_count(ngx_regex_t *re)
83 { 83 {
84 int rc, n; 84 int rc, n;
85 85
86 n = 0; 86 n = 0;
87 87
88 rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n); 88 rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
89 89
90 return (ngx_uint_t) n; 90 if (rc < 0) {
91 return (ngx_int_t) rc;
92 }
93
94 return (ngx_int_t) n;
91 } 95 }
92 96
93 97
94 ngx_int_t ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s, 98 ngx_int_t ngx_regex_exec(ngx_regex_t *re, ngx_str_t *s,
95 int *captures, ngx_int_t size) 99 int *captures, ngx_int_t size)