httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Yann Ylavic <ylavic....@gmail.com>
Subject Re: svn commit: r1726233 - in /httpd/httpd/trunk: docs/manual/mod/core.xml include/http_core.h server/core.c
Date Tue, 09 Feb 2016 08:35:28 GMT
On Fri, Jan 22, 2016 at 4:30 PM,  <covener@apache.org> wrote:
> Author: covener
> Date: Fri Jan 22 15:30:19 2016
> New Revision: 1726233
>
> URL: http://svn.apache.org/viewvc?rev=1726233&view=rev
> Log:
> from feedback, assume all parameters to SetHandler are expressions.
>
> Modified:
>     httpd/httpd/trunk/server/core.c
>
[]
> Modified: httpd/httpd/trunk/server/core.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1726233&r1=1726232&r2=1726233&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/core.c (original)
> +++ httpd/httpd/trunk/server/core.c Fri Jan 22 15:30:19 2016
[]
> @@ -4668,7 +4655,13 @@ static int core_override_type(request_re
>              return HTTP_INTERNAL_SERVER_ERROR;
>          }
>          if (strcmp(val, "none")) {
> -            r->handler = apr_pstrdup(r->pool, val);
> +            if (val != ap_strstr_c(val, "proxy:unix")) {
> +                /* Retained for compatibility --  but not for UDS */
> +                char *tmp = apr_pstrdup(r->pool, val);
> +                ap_str_tolower(tmp);
> +                r->handler = tmp;
> +            }
> +            r->handler = val;

Missing an "else"?

>          }
>      }
>      else if (conf->handler && strcmp(conf->handler, "none")) {
>
>

Mime
View raw message