httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r109499 - /httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
Date Thu, 02 Dec 2004 13:34:48 GMT
Author: jorton
Date: Thu Dec  2 05:34:48 2004
New Revision: 109499

URL: http://svn.apache.org/viewcvs?view=rev&rev=109499
Log:
* modules/ssl/ssl_engine_io.c (ssl_io_filter_Upgrade): Remove the
unnecessary check of the Connection request header.

Modified:
   httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?view=diff&rev=109499&p1=httpd/httpd/trunk/modules/ssl/ssl_engine_io.c&r1=109498&p2=httpd/httpd/trunk/modules/ssl/ssl_engine_io.c&r2=109499
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c	(original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c	Thu Dec  2 05:34:48 2004
@@ -1177,7 +1177,6 @@
 #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;
@@ -1205,18 +1204,6 @@
         apr_strtok(NULL,", ",&token_state);
     }
     /* "Upgrade: TLS/1.0" header not found, don't do Upgrade */
-    if (!token) {
-        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);
     }

Mime
View raw message