Blame SOURCES/httpd-2.4.6-r1573626.patch
|
 |
8335b1 |
--- a/modules/proxy/mod_proxy.c 2014/03/03 17:28:10 1573625
|
|
|
8335b1 |
+++ b/modules/proxy/mod_proxy.c 2014/03/03 17:28:17 1573626
|
|
|
8335b1 |
@@ -927,8 +927,25 @@
|
|
|
8335b1 |
struct dirconn_entry *list = (struct dirconn_entry *)conf->dirconn->elts;
|
|
|
8335b1 |
|
|
|
8335b1 |
/* is this for us? */
|
|
|
8335b1 |
- if (!r->proxyreq || !r->filename || strncmp(r->filename, "proxy:", 6) != 0)
|
|
|
8335b1 |
+ if (!r->filename) {
|
|
|
8335b1 |
return DECLINED;
|
|
|
8335b1 |
+ }
|
|
|
8335b1 |
+
|
|
|
8335b1 |
+ if (!r->proxyreq) {
|
|
|
8335b1 |
+ /* We may have forced the proxy handler via config or .htaccess */
|
|
|
8335b1 |
+ if (r->handler &&
|
|
|
8335b1 |
+ strncmp(r->handler, "proxy:", 6) == 0 &&
|
|
|
8335b1 |
+ strncmp(r->filename, "proxy:", 6) != 0) {
|
|
|
8335b1 |
+ r->proxyreq = PROXYREQ_REVERSE;
|
|
|
8335b1 |
+ r->filename = apr_pstrcat(r->pool, r->handler, r->filename, NULL);
|
|
|
8335b1 |
+ apr_table_setn(r->notes, "rewrite-proxy", "1");
|
|
|
8335b1 |
+ }
|
|
|
8335b1 |
+ else {
|
|
|
8335b1 |
+ return DECLINED;
|
|
|
8335b1 |
+ }
|
|
|
8335b1 |
+ } else if (strncmp(r->filename, "proxy:", 6) != 0) {
|
|
|
8335b1 |
+ return DECLINED;
|
|
|
8335b1 |
+ }
|
|
|
8335b1 |
|
|
|
8335b1 |
/* handle max-forwards / OPTIONS / TRACE */
|
|
|
8335b1 |
if ((str = apr_table_get(r->headers_in, "Max-Forwards"))) {
|