You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
840 B
26 lines
840 B
# ./pullrev.sh 1737363 |
|
http://svn.apache.org/viewvc?view=revision&revision=1737363 |
|
|
|
--- httpd-2.4.6/modules/proxy/mod_proxy_express.c |
|
+++ httpd-2.4.6/modules/proxy/mod_proxy_express.c |
|
@@ -145,16 +145,14 @@ |
|
key.dsize = strlen(key.dptr); |
|
|
|
rv = apr_dbm_fetch(db, key, &val); |
|
+ if (rv == APR_SUCCESS) { |
|
+ backend = apr_pstrmemdup(r->pool, val.dptr, val.dsize); |
|
+ } |
|
apr_dbm_close(db); |
|
- if (rv != APR_SUCCESS) { |
|
+ if (rv != APR_SUCCESS || !backend) { |
|
return DECLINED; |
|
} |
|
|
|
- backend = apr_pstrmemdup(r->pool, val.dptr, val.dsize); |
|
- if (!backend) { |
|
- return DECLINED; |
|
- } |
|
- |
|
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01004) |
|
"proxy_express: found %s -> %s", name, backend); |
|
r->filename = apr_pstrcat(r->pool, "proxy:", backend, r->uri, NULL);
|
|
|