j...@apache.org wrote: > Author: jim > Date: Fri Feb 7 13:54:38 2014 > New Revision: 1565657 > > URL: http://svn.apache.org/r1565657 > Log: > Add in the concept of "slave" connections... > Allows for several "connections" all resulting in > a single real connection that talks to the network. > Right now, nothing uses this though. > > Modified: > httpd/httpd/trunk/include/ap_mmn.h > httpd/httpd/trunk/include/http_core.h > httpd/httpd/trunk/include/httpd.h > httpd/httpd/trunk/server/connection.c > httpd/httpd/trunk/server/core.c >
> Modified: httpd/httpd/trunk/server/connection.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/server/connection.c?rev=1565657&r1=1565656&r2=1565657&view=diff > ============================================================================== > --- httpd/httpd/trunk/server/connection.c (original) > +++ httpd/httpd/trunk/server/connection.c Fri Feb 7 13:54:38 2014 > @@ -4841,10 +4842,15 @@ static conn_rec *core_create_conn(apr_po > /* Got a connection structure, so initialize what fields we can > * (the rest are zeroed out by pcalloc). > */ > - c->conn_config = ap_create_conn_config(ptrans); > - c->notes = apr_table_make(ptrans, 5); > + apr_pool_create(&pool, ptrans); > + apr_pool_tag(pool, "master_conn"); > + c->pool = pool; > + > + c->conn_config = ap_create_conn_config(c->pool); > + c->notes = apr_table_make(c->pool, 5); > + c->slaves = apr_array_make(c->pool, 20, sizeof(conn_rec *)); Nitpicking: Shouldn't that be sizeof(conn_slave_rec *)? It doesn't make a real difference, but makes things clearer I guess. > + > > - c->pool = ptrans; > if ((rv = apr_socket_addr_get(&c->local_addr, APR_LOCAL, csd)) > != APR_SUCCESS) { > ap_log_error(APLOG_MARK, APLOG_INFO, rv, s, APLOGNO(00137) Regards Rüdiger
