Mercurial > hg > nginx

comparison src/http/ngx_http_request.c @ 6129:187aa751ad62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Core: the ngx_set_connection_log() macro. The http and stream versions of this macro were identical.
author Vladimir Homutov <vl@nginx.com>
date Sat, 25 Apr 2015 22:44:02 +0300
parents adba26ff70b5
children a420cb1c170b
comparison
equal deleted inserted replaced
6128:69ad3e77922b 6129:187aa751ad62
541 541
542 r->read_event_handler = ngx_http_block_reading; 542 r->read_event_handler = ngx_http_block_reading;
543 543
544 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 544 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
545 545
546 ngx_http_set_connection_log(r->connection, clcf->error_log); 546 ngx_set_connection_log(r->connection, clcf->error_log);
547 547
548 r->header_in = hc->nbusy ? hc->busy[0] : c->buffer; 548 r->header_in = hc->nbusy ? hc->busy[0] : c->buffer;
549 549
550 if (ngx_list_init(&r->headers_out.headers, r->pool, 20, 550 if (ngx_list_init(&r->headers_out.headers, r->pool, 20,
551 sizeof(ngx_table_elt_t)) 551 sizeof(ngx_table_elt_t))
865 865
866 hc->conf_ctx = cscf->ctx; 866 hc->conf_ctx = cscf->ctx;
867 867
868 clcf = ngx_http_get_module_loc_conf(hc->conf_ctx, ngx_http_core_module); 868 clcf = ngx_http_get_module_loc_conf(hc->conf_ctx, ngx_http_core_module);
869 869
870 ngx_http_set_connection_log(c, clcf->error_log); 870 ngx_set_connection_log(c, clcf->error_log);
871 871
872 sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module); 872 sscf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_ssl_module);
873 873
874 if (sscf->ssl.ctx) { 874 if (sscf->ssl.ctx) {
875 SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx); 875 SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx);
2071 r->srv_conf = cscf->ctx->srv_conf; 2071 r->srv_conf = cscf->ctx->srv_conf;
2072 r->loc_conf = cscf->ctx->loc_conf; 2072 r->loc_conf = cscf->ctx->loc_conf;
2073 2073
2074 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); 2074 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
2075 2075
2076 ngx_http_set_connection_log(r->connection, clcf->error_log); 2076 ngx_set_connection_log(r->connection, clcf->error_log);
2077 2077
2078 return NGX_OK; 2078 return NGX_OK;
2079 } 2079 }
2080 2080
2081 2081