|
Lines 131-136
Link Here
|
| 131 |
|
131 |
|
| 132 |
if (ap_cstr_casecmp(upgrade_method, "NONE") == 0) { |
132 |
if (ap_cstr_casecmp(upgrade_method, "NONE") == 0) { |
| 133 |
buf = apr_pstrdup(p, "Upgrade: WebSocket" CRLF "Connection: Upgrade" CRLF CRLF); |
133 |
buf = apr_pstrdup(p, "Upgrade: WebSocket" CRLF "Connection: Upgrade" CRLF CRLF); |
|
|
134 |
} else if (ap_cstr_casecmp(upgrade_method, "ANY") == 0) { |
| 135 |
const char *upgrade; |
| 136 |
upgrade = apr_table_get(r->headers_in, "Upgrade"); |
| 137 |
buf = apr_pstrcat(p, "Upgrade: ", upgrade, CRLF "Connection: Upgrade" CRLF CRLF, NULL); |
| 134 |
} else { |
138 |
} else { |
| 135 |
buf = apr_pstrcat(p, "Upgrade: ", upgrade_method, CRLF "Connection: Upgrade" CRLF CRLF, NULL); |
139 |
buf = apr_pstrcat(p, "Upgrade: ", upgrade_method, CRLF "Connection: Upgrade" CRLF CRLF, NULL); |
| 136 |
} |
140 |
} |
|
Lines 302-308
Link Here
|
| 302 |
if (ap_cstr_casecmp(upgrade_method, "NONE") != 0) { |
306 |
if (ap_cstr_casecmp(upgrade_method, "NONE") != 0) { |
| 303 |
const char *upgrade; |
307 |
const char *upgrade; |
| 304 |
upgrade = apr_table_get(r->headers_in, "Upgrade"); |
308 |
upgrade = apr_table_get(r->headers_in, "Upgrade"); |
| 305 |
if (!upgrade || ap_cstr_casecmp(upgrade, upgrade_method) != 0) { |
309 |
if (!upgrade || (ap_cstr_casecmp(upgrade, upgrade_method) != 0 && |
|
|
310 |
ap_cstr_casecmp(upgrade_method, "ANY") !=0)) { |
| 306 |
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02900) |
311 |
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02900) |
| 307 |
"declining URL %s (not %s, Upgrade: header is %s)", |
312 |
"declining URL %s (not %s, Upgrade: header is %s)", |
| 308 |
url, upgrade_method, upgrade ? upgrade : "missing"); |
313 |
url, upgrade_method, upgrade ? upgrade : "missing"); |