You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Christophe JAILLET <ch...@wanadoo.fr> on 2014/02/03 20:17:18 UTC
Re: svn commit: r1562174 - in /httpd/httpd/branches/2.4.x: ./ STATUS
docs/manual/ docs/manual/howto/ docs/manual/mod/ docs/manual/mod/mod_macro.xml
docs/manual/rewrite/ docs/manual/rewrite/flags.xml modules/mappers/mod_rewrite.c
Le 28/01/2014 20:40, jim@apache.org a écrit :
> Author: jim
> Date: Tue Jan 28 19:40:17 2014
> New Revision: 1562174
>
> URL: http://svn.apache.org/r1562174
> Log:
> Merge r1556206 from trunk:
>
> avoid a tight busy loop with memory allocations when the [N] flag
> isn't making progress.
>
> If backported, probably increase the hard-coded limit to 32k from 10k.
>
>
> Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1562174&r1=1562173&r2=1562174&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original)
> +++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Tue Jan 28 19:40:17 2014
> @@ -231,6 +231,9 @@ static const char* really_last_key = "re
> #define subreq_ok(r) (!r->main || \
> (r->main->uri && r->uri && strcmp(r->main->uri, r->uri)))
>
> +#ifndef REWRITE_MAX_ROUNDS
> +#define REWRITE_MAX_ROUNDS 32000
> +#endif
Should trunk be synch with 2.4.x with this 32000 limit ?
CJ
Re: svn commit: r1562174 - in /httpd/httpd/branches/2.4.x: ./ STATUS
docs/manual/ docs/manual/howto/ docs/manual/mod/ docs/manual/mod/mod_macro.xml
docs/manual/rewrite/ docs/manual/rewrite/flags.xml modules/mappers/mod_rewrite.c
Posted by Eric Covener <co...@gmail.com>.
>> 19:40:17 2014
>> @@ -231,6 +231,9 @@ static const char* really_last_key = "re
>> #define subreq_ok(r) (!r->main || \
>> (r->main->uri && r->uri && strcmp(r->main->uri, r->uri)))
>> +#ifndef REWRITE_MAX_ROUNDS
>> +#define REWRITE_MAX_ROUNDS 32000
>> +#endif
>
>
> Should trunk be synch with 2.4.x with this 32000 limit ?
Intentionally different, being more paranoid in 2.4.x to not surprise
anyone applying a new fix level.