www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* modules/ssl/ssl_engine_io.c (ssl_io_filter_Upgrade): Remove the

Browse Source 
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
This commit is contained in:
Joe Orton
2004-12-02 13:34:48 +00:00
parent a756d60d81
commit db21c0932f
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/ssl/ssl_engine_io.c
View File

@@ -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 UPGRADE_HEADER "Upgrade: TLS/1.0, HTTP/1.1"
#define CONNECTION_HEADER "Connection: Upgrade" #define CONNECTION_HEADER "Connection: Upgrade"
const char *upgrade; const char *upgrade;
const char *connection;
apr_bucket_brigade *upgradebb; apr_bucket_brigade *upgradebb;
request_rec *r = f->r; request_rec *r = f->r;
SSLConnRec *sslconn; 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); 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"); apr_table_unset(r->headers_out, "Upgrade");
if (r->method_number == M_OPTIONS) { if (r->method_number == M_OPTIONS) {