mirror of
https://github.com/apache/httpd.git
synced 2025-11-05 05:30:39 +03:00
Begin to abstract out the underlying transport layer.
The first step is to remove the socket from the conn_rec, the server now lives in a context that is passed to the core's input and output filters. This forces us to be very careful when adding calls that use the socket directly, because the socket isn't available in most locations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91887 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -173,7 +173,6 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r)
|
||||
const apr_table_entry_t *hdrs = (const apr_table_entry_t *) hdrs_arr->elts;
|
||||
int i;
|
||||
apr_port_t rport;
|
||||
apr_sockaddr_t *remotesa;
|
||||
|
||||
/* use a temporary apr_table_t which we'll overlap onto
|
||||
* r->subprocess_env later
|
||||
@@ -273,8 +272,7 @@ AP_DECLARE(void) ap_add_common_vars(request_rec *r)
|
||||
apr_table_addn(e, "SERVER_ADMIN", s->server_admin); /* Apache */
|
||||
apr_table_addn(e, "SCRIPT_FILENAME", r->filename); /* Apache */
|
||||
|
||||
apr_socket_addr_get(&remotesa, APR_REMOTE, c->client_socket);
|
||||
apr_sockaddr_port_get(&rport, remotesa);
|
||||
apr_sockaddr_port_get(&rport, c->remote_addr);
|
||||
apr_table_addn(e, "REMOTE_PORT", apr_psprintf(r->pool, "%d", rport));
|
||||
|
||||
if (r->user) {
|
||||
|
||||
Reference in New Issue
Block a user