Commit 63bdc9d9 authored by Joe Orton's avatar Joe Orton
Browse files

* 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/modules/ssl@109499 13f79535-47bb-0310-9956-ffa450edef68
parent e8bff0b0

ssl_engine_io.c

+0 −13
Original line number Diff line number Diff line
@@ -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) {