Commit 3b68dcd7 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Close PR 32459, 15207. API change for PROXY_DECLARE ap_proxy_canonenc() 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151153 13f79535-47bb-0310-9956-ffa450edef68
parent 4dcdd9bc

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ Changes with Apache 2.1.3 








  [Remove entries to the current 2.0 section below, when backported]

















  *) mod_proxy: Fix incorrect decoding/unescaping for reverse proxies.









     PR 32459, 15207. [Jim Jagielski]

















  *) Start keeping track of time-taken-to-process-request again for









     mod_status if ExtendedStatus is enabled. [Jim Jagielski]










































modules/proxy/mod_proxy.c



+0
−1



























Changes for modules/proxy/mod_proxy.c: 0 added lines, 1 removed line.



Original line number
Diff line number
Diff line









#define FIX_15207









/* Copyright 1999-2004 The Apache Software Foundation









 *









 * Licensed under the Apache License, Version 2.0 (the "License");


































modules/proxy/mod_proxy.h



+1
−1



























Changes for modules/proxy/mod_proxy.h: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -381,7 +381,7 @@ PROXY_DECLARE(request_rec *)ap_proxy_make_fake_req(conn_rec *c, request_rec *r);







PROXY_DECLARE(int) ap_proxy_hex2c(const char *x);









PROXY_DECLARE(void) ap_proxy_c2hex(int ch, char *x);









PROXY_DECLARE(char *)ap_proxy_canonenc(apr_pool_t *p, const char *x, int len, enum enctype t,









                                       int isenc);









                                       int forcedec, int proxyreq);









PROXY_DECLARE(char *)ap_proxy_canon_netloc(apr_pool_t *p, char **const urlp, char **userp,









                                           char **passwordp, char **hostp, apr_port_t *port);









PROXY_DECLARE(const char *)ap_proxy_date_canon(apr_pool_t *p, const char *x);


































modules/proxy/proxy_ajp.c



+1
−1



























Changes for modules/proxy/proxy_ajp.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -79,7 +79,7 @@ static int proxy_ajp_canon(request_rec *r, char *url)







        search = r->args;



















    /* process path */









    path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, r->proxyreq);









    path = ap_proxy_canonenc(r->pool, url, strlen(url), enc_path, 0, r->proxyreq);









    if (path == NULL)









        return HTTP_BAD_REQUEST;












































modules/proxy/proxy_ftp.c



+4
−4



























Changes for modules/proxy/proxy_ftp.c: 4 added lines, 4 removed lines.



Original line number
Diff line number
Diff line







@@ -166,7 +166,7 @@ static int proxy_ftp_canon(request_rec *r, char *url)







    strp = strchr(url, ';');









    if (strp != NULL) {









        *(strp++) = '\0';









        parms = ap_proxy_canonenc(p, strp, strlen(strp), enc_parm,









        parms = ap_proxy_canonenc(p, strp, strlen(strp), enc_parm, 0,









                                  r->proxyreq);









        if (parms == NULL)









            return HTTP_BAD_REQUEST;










@@ -174,7 +174,7 @@ static int proxy_ftp_canon(request_rec *r, char *url)







    else









        parms = "";



















    path = ap_proxy_canonenc(p, url, strlen(url), enc_path, r->proxyreq);









    path = ap_proxy_canonenc(p, url, strlen(url), enc_path, 0, r->proxyreq);









    if (path == NULL)









        return HTTP_BAD_REQUEST;









    if (!ftp_check_string(path))










@@ -182,13 +182,13 @@ static int proxy_ftp_canon(request_rec *r, char *url)

















    if (r->proxyreq && r->args != NULL) {









        if (strp != NULL) {









            strp = ap_proxy_canonenc(p, r->args, strlen(r->args), enc_parm, 1);









            strp = ap_proxy_canonenc(p, r->args, strlen(r->args), enc_parm, 1, r->proxyreq);









            if (strp == NULL)









                return HTTP_BAD_REQUEST;









            parms = apr_pstrcat(p, parms, "?", strp, NULL);









        }









        else {









            strp = ap_proxy_canonenc(p, r->args, strlen(r->args), enc_fpath, 1);









            strp = ap_proxy_canonenc(p, r->args, strlen(r->args), enc_fpath, 1, r->proxyreq);









            if (strp == NULL)









                return HTTP_BAD_REQUEST;









            path = apr_pstrcat(p, path, "?", strp, NULL);