From: Joe Orton Date: Thu, 2 Dec 2004 13:34:48 +0000 (+0000) Subject: * modules/ssl/ssl_engine_io.c (ssl_io_filter_Upgrade): Remove the X-Git-Tag: 2.1.2~24 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db21c0932f1af40c1be2e0c53cc9b4aa5b246181;p=apache * modules/ssl/ssl_engine_io.c (ssl_io_filter_Upgrade): Remove the unnecessary check of the Connection request header. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109499 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 9a870adf23..76baa6de1e 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -1177,7 +1177,6 @@ static apr_status_t ssl_io_filter_Upgrade(ap_filter_t *f, #define UPGRADE_HEADER "Upgrade: TLS/1.0, HTTP/1.1" #define CONNECTION_HEADER "Connection: Upgrade" const char *upgrade; - const char *connection; apr_bucket_brigade *upgradebb; request_rec *r = f->r; SSLConnRec *sslconn; @@ -1209,18 +1208,6 @@ static apr_status_t ssl_io_filter_Upgrade(ap_filter_t *f, return ap_pass_brigade(f->next, bb); } - connection = apr_table_get(r->headers_in, "Connection"); - - token_string = apr_pstrdup(r->pool,connection); - token = apr_strtok(token_string,",",&token_state); - while (token && strcasecmp(token,"Upgrade")) { - apr_strtok(NULL,",",&token_state); - } - /* "Connection: Upgrade" header not found, don't do Upgrade */ - if (!token) { - return ap_pass_brigade(f->next, bb); - } - apr_table_unset(r->headers_out, "Upgrade"); if (r->method_number == M_OPTIONS) {