summaryrefslogtreecommitdiffstats
path: root/modules/proxy/mod_proxy_http.c
diff options
context:
space:
mode:
authorRuediger Pluem <rpluem@apache.org>2011-02-11 13:50:31 +0100
committerRuediger Pluem <rpluem@apache.org>2011-02-11 13:50:31 +0100
commit91960c0b37667d922fdcd1482b5d9d22926bcbb7 (patch)
treea087b9b77cb372eb01556880d3e03bf04daa02f2 /modules/proxy/mod_proxy_http.c
parent* modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle): Fix possible (diff)
downloadapache2-91960c0b37667d922fdcd1482b5d9d22926bcbb7.tar.xz
apache2-91960c0b37667d922fdcd1482b5d9d22926bcbb7.zip
* Play safe if the notes table does not contain an SSL_connect_rv key.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1069785 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--modules/proxy/mod_proxy_http.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index 958e4e10d1..7271ca17fb 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -272,8 +272,10 @@ static int pass_brigade(apr_bucket_alloc_t *bucket_alloc,
"proxy: pass request body failed to %pI (%s)",
p_conn->addr, p_conn->hostname);
if (origin->aborted) {
- if (strcmp(apr_table_get(origin->notes,
- "SSL_connect_rv"), "err") == 0) {
+ const char *ssl_note;
+
+ if (((ssl_note = apr_table_get(origin->notes, "SSL_connect_rv"))
+ != NULL) && (strcmp(ssl_note, "err") == 0)) {
return ap_proxyerror(r, HTTP_INTERNAL_SERVER_ERROR,
"Error during SSL Handshake with"
" remote server");