[nginx] svn commit: r4327 - trunk/src/core

[Maxim Dounin]

Hello!

On Tue, Dec 06, 2011 at 04:23:34PM +0000, Valery Kholodkov wrote:

> 
> FYI This function is used in upload module: 
> 
> https://github.com/vkholodkov/nginx-upload-module/blob/2.2/ngx_http_upload_module.c#L2656

No, it's in #else part of the:

#if defined nginx_version && nginx_version >= 8025

The prototype for the function was nuked in 0.8.25 during named 
captures introduction (and corresponding regexp changes).

Maxim Dounin

> 
> ----- vbart at nginx.com wrote:
> > Author: vbart
> > Date: 2011-12-06 15:49:40 +0000 (Tue, 06 Dec 2011)
> > New Revision: 4327
> > 
> > Modified:
> >    trunk/src/core/ngx_regex.c
> > Log:
> > Removed unused function ngx_regex_capture_count().
> > The function has been unused since r3326.
> > 
> > 
> > Modified: trunk/src/core/ngx_regex.c
> > ===================================================================
> > --- trunk/src/core/ngx_regex.c	2011-12-06 13:23:37 UTC (rev 4326)
> > +++ trunk/src/core/ngx_regex.c	2011-12-06 15:49:40 UTC (rev 4327)
> > @@ -137,23 +137,6 @@
> >  
> >  
> >  ngx_int_t
> > -ngx_regex_capture_count(ngx_regex_t *re)
> > -{
> > -    int  rc, n;
> > -
> > -    n = 0;
> > -
> > -    rc = pcre_fullinfo(re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
> > -
> > -    if (rc < 0) {
> > -        return (ngx_int_t) rc;
> > -    }
> > -
> > -    return (ngx_int_t) n;
> > -}
> > -
> > -
> > -ngx_int_t
> >  ngx_regex_exec_array(ngx_array_t *a, ngx_str_t *s, ngx_log_t *log)
> >  {
> >      ngx_int_t         n;
>  
> -- 
> Regards,
> Valery Kholodkov
> 
> _______________________________________________
> nginx-devel mailing list
> nginx-devel at nginx.org
> http://mailman.nginx.org/mailman/listinfo/nginx-devel