Blame SOURCES/httpd-2.4.6-r1737363.patch
|
 |
c0c6d9 |
# ./pullrev.sh 1737363
|
|
|
c0c6d9 |
http://svn.apache.org/viewvc?view=revision&revision=1737363
|
|
|
c0c6d9 |
|
|
|
c0c6d9 |
--- httpd-2.4.6/modules/proxy/mod_proxy_express.c
|
|
|
c0c6d9 |
+++ httpd-2.4.6/modules/proxy/mod_proxy_express.c
|
|
|
c0c6d9 |
@@ -145,16 +145,14 @@
|
|
|
c0c6d9 |
key.dsize = strlen(key.dptr);
|
|
|
c0c6d9 |
|
|
|
c0c6d9 |
rv = apr_dbm_fetch(db, key, &val;;
|
|
|
c0c6d9 |
+ if (rv == APR_SUCCESS) {
|
|
|
c0c6d9 |
+ backend = apr_pstrmemdup(r->pool, val.dptr, val.dsize);
|
|
|
c0c6d9 |
+ }
|
|
|
c0c6d9 |
apr_dbm_close(db);
|
|
|
c0c6d9 |
- if (rv != APR_SUCCESS) {
|
|
|
c0c6d9 |
+ if (rv != APR_SUCCESS || !backend) {
|
|
|
c0c6d9 |
return DECLINED;
|
|
|
c0c6d9 |
}
|
|
|
c0c6d9 |
|
|
|
c0c6d9 |
- backend = apr_pstrmemdup(r->pool, val.dptr, val.dsize);
|
|
|
c0c6d9 |
- if (!backend) {
|
|
|
c0c6d9 |
- return DECLINED;
|
|
|
c0c6d9 |
- }
|
|
|
c0c6d9 |
-
|
|
|
c0c6d9 |
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01004)
|
|
|
c0c6d9 |
"proxy_express: found %s -> %s", name, backend);
|
|
|
c0c6d9 |
r->filename = apr_pstrcat(r->pool, "proxy:", backend, r->uri, NULL);
|