Attachment #26346 for bug #50332

View | Details | Raw Unified | Return to bug 50332
Collapse All | Expand All

Lines 1468-1473 Link Here

(-)httpd-trunk/modules/proxy/mod_proxy_http.c (+4 lines)
1468	return ap_proxyerror(r, HTTP_SERVICE_UNAVAILABLE, "Timeout on 100-Continue");	1468	return ap_proxyerror(r, HTTP_SERVICE_UNAVAILABLE, "Timeout on 100-Continue");
1469	}	1469	}
1470	}	1470	}
		1471	else if(strcmp(apr_table_get(backend->connection->notes, "SSL_connect_rv"), "err") == 0) {
		1472	return ap_proxyerror(r, HTTP_INTERNAL_SERVER_ERROR,
		1473	"Error during SSL Handshake with remote server");
		1474	}
1471	/*	1475	/*
1472	* If we are a reverse proxy request shutdown the connection	1476	* If we are a reverse proxy request shutdown the connection
1473	* WITHOUT ANY response to trigger a retry by the client	1477	* WITHOUT ANY response to trigger a retry by the client




            ssl_log_ssl_error(SSLLOG_MARK, APLOG_INFO, server);
            /* ensure that the SSL structures etc are freed, etc: */
            ssl_filter_io_shutdown(filter_ctx, c, 1);
            apr_table_set(c->notes, "SSL_connect_rv", "err");
            return MODSSL_ERROR_BAD_GATEWAY;
        }


                }
                /* ensure that the SSL structures etc are freed, etc: */
                ssl_filter_io_shutdown(filter_ctx, c, 1);
                apr_table_set(c->notes, "SSL_connect_rv", "err");
                return HTTP_BAD_GATEWAY;
            }
            X509_free(cert);

                              hostname, hostname_note);
                /* ensure that the SSL structures etc are freed, etc: */
                ssl_filter_io_shutdown(filter_ctx, c, 1);
                apr_table_set(c->notes, "SSL_connect_rv", "err");
                return HTTP_BAD_GATEWAY;
            }
        }

        apr_table_set(c->notes, "SSL_connect_rv", "ok");
        return APR_SUCCESS;
    }


Return to bug 50332

Lines 1091-1096 Link Here

(-)httpd-trunk/modules/ssl/ssl_engine_io.c (+4 lines)
1091	ssl_log_ssl_error(SSLLOG_MARK, APLOG_INFO, server);	1091	ssl_log_ssl_error(SSLLOG_MARK, APLOG_INFO, server);
1092	/* ensure that the SSL structures etc are freed, etc: */	1092	/* ensure that the SSL structures etc are freed, etc: */
1093	ssl_filter_io_shutdown(filter_ctx, c, 1);	1093	ssl_filter_io_shutdown(filter_ctx, c, 1);
		1094	apr_table_set(c->notes, "SSL_connect_rv", "err");
1094	return MODSSL_ERROR_BAD_GATEWAY;	1095	return MODSSL_ERROR_BAD_GATEWAY;
1095	}	1096	}
1096		1097
Lines 1108-1113 Link Here
1108	}	1109	}
1109	/* ensure that the SSL structures etc are freed, etc: */	1110	/* ensure that the SSL structures etc are freed, etc: */
1110	ssl_filter_io_shutdown(filter_ctx, c, 1);	1111	ssl_filter_io_shutdown(filter_ctx, c, 1);
		1112	apr_table_set(c->notes, "SSL_connect_rv", "err");
1111	return HTTP_BAD_GATEWAY;	1113	return HTTP_BAD_GATEWAY;
1112	}	1114	}
1113	X509_free(cert);	1115	X509_free(cert);
Lines 1127-1136 Link Here
1127	hostname, hostname_note);	1129	hostname, hostname_note);
1128	/* ensure that the SSL structures etc are freed, etc: */	1130	/* ensure that the SSL structures etc are freed, etc: */
1129	ssl_filter_io_shutdown(filter_ctx, c, 1);	1131	ssl_filter_io_shutdown(filter_ctx, c, 1);
		1132	apr_table_set(c->notes, "SSL_connect_rv", "err");
1130	return HTTP_BAD_GATEWAY;	1133	return HTTP_BAD_GATEWAY;
1131	}	1134	}
1132	}	1135	}
1133		1136
		1137	apr_table_set(c->notes, "SSL_connect_rv", "ok");
1134	return APR_SUCCESS;	1138	return APR_SUCCESS;
1135	}	1139	}
1136		1140