You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/03/05 20:18:56 UTC
svn commit: r1452954 - /httpd/httpd/trunk/modules/proxy/mod_proxy_websocket.c
Author: jim
Date: Tue Mar 5 19:18:55 2013
New Revision: 1452954
URL: http://svn.apache.org/r1452954
Log:
We need to ensure a conn_rec
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_websocket.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_websocket.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_websocket.c?rev=1452954&r1=1452953&r2=1452954&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_websocket.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_websocket.c Tue Mar 5 19:18:55 2013
@@ -263,6 +263,7 @@ static int proxy_websocket_handler(reque
proxy_conn_rec *backend = NULL;
char *scheme;
int retry;
+ conn_rec *c = r->connection;
proxy_dir_conf *dconf = ap_get_module_config(r->per_dir_config,
&proxy_module);
apr_pool_t *p = r->pool;
@@ -316,6 +317,12 @@ static int proxy_websocket_handler(reque
status = HTTP_SERVICE_UNAVAILABLE;
break;
}
+ /* Step Three: Create conn_rec */
+ if (!backend->connection) {
+ if ((status = ap_proxy_connection_create(scheme, backend,
+ c, r->server)) != OK)
+ break;
+ }
/* Step Three: Process the Request */
status = ap_proxy_websocket_request(p, r, backend, origin, dconf, uri, locurl,