nginx-vendor-current: src/http/ngx_http

comparison src/http/ngx_http_request.c @ 28:7ca9bdc82b3f NGINX_0_1_14

nginx 0.1.14 *) Feature: the autoconfiguration directives: --http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and --http-fastcgi-temp-path=PATH *) Change: the directory name for the temporary files with the client request body is specified by directive client_body_temp_path, by default it is <prefix>/client_body_temp. *) Feature: the ngx_http_fastcgi_module and the directives: fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params, fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout, fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers, fastcgi_busy_buffers_size, fastcgi_temp_path, fastcgi_max_temp_file_size, fastcgi_temp_file_write_size, fastcgi_next_upstream, and fastcgi_x_powered_by. *) Bugfix: the "[alert] zero size buf" error; bug appeared in 0.1.3. *) Change: the URI must be specified after the host name in the proxy_pass directive. *) Change: the %3F symbol in the URI was considered as the argument string start. *) Feature: the unix domain sockets support in the ngx_http_proxy_module. *) Feature: the ssl_engine and ssl_ciphers directives. Thanks to Sergey Skvortsov for SSL-accelerator.

author	Igor Sysoev <http://sysoev.ru>
date	Tue, 18 Jan 2005 00:00:00 +0300
parents	45fe5b98a9de
children	da8c190bdaba

comparison

equal deleted inserted replaced

-:66901c2556fd
+:7ca9bdc82b3f
 offsetof(ngx_http_headers_in_t, if_modified_since) },
 { ngx_string("User-Agent"), offsetof(ngx_http_headers_in_t, user_agent) },
 { ngx_string("Referer"), offsetof(ngx_http_headers_in_t, referer) },
 { ngx_string("Content-Length"),
 offsetof(ngx_http_headers_in_t, content_length) },
+{ ngx_string("Content-Type"),
+offsetof(ngx_http_headers_in_t, content_type) },
 { ngx_string("Range"), offsetof(ngx_http_headers_in_t, range) },
 #if 0
 { ngx_string("If-Range"), offsetof(ngx_http_headers_in_t, if_range) },
 #endif
 { ngx_string("X-Forwarded-For"),
 offsetof(ngx_http_headers_in_t, x_forwarded_for) },
 { ngx_string("X-Real-IP"), offsetof(ngx_http_headers_in_t, x_real_ip) },
 { ngx_string("X-URL"), offsetof(ngx_http_headers_in_t, x_url) },
 #endif
 { ngx_null_string, 0 }
 };
 #if 0
 static void ngx_http_init_request(ngx_event_t *rev)
 {
 ngx_uint_t                 i;
 socklen_t                  len;
-struct sockaddr_in         addr_in;
+struct sockaddr_in         sin;
 ngx_connection_t          *c;
 ngx_http_request_t        *r;
 ngx_http_in_port_t        *in_port;
 ngx_http_in_addr_t        *in_addr;
 ngx_http_connection_t     *hc;
 #if (NGX_WIN32)
 if (c->local_sockaddr) {
 r->in_addr =
 ((struct sockaddr_in *) c->local_sockaddr)->sin_addr.s_addr;
-} else {
+} else
 #endif
+{
 len = sizeof(struct sockaddr_in);
-if (getsockname(c->fd, (struct sockaddr *) &addr_in, &len) == -1) {
+if (getsockname(c->fd, (struct sockaddr *) &sin, &len) == -1) {
 ngx_connection_error(c, ngx_socket_errno,
 "getsockname() failed");
 ngx_http_close_connection(c);
 return;
 }
-r->in_addr = addr_in.sin_addr.s_addr;
+r->in_addr = sin.sin_addr.s_addr;
+}
-#if (NGX_WIN32)
-}
-#endif
 /* the last in_port->addrs address is "*" */
 for ( /* void */ ; i < in_port->addrs.nelts - 1; i++) {
 if (in_addr[i].addr == r->in_addr) {
 if (r->method == 0) {
 r->method_name.len = r->method_end - r->request_start + 1;
 r->method_name.data = r->request_line.data;
+}
+if (r->http_protocol.data) {
+r->http_protocol.len = r->request_end - r->http_protocol.data;
 }
 if (r->uri_ext) {
 if (r->args_start) {
 #endif
 void ngx_http_close_connection(ngx_connection_t *c)
 {
+ngx_pool_t  *pool;
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
 "close http connection: %d", c->fd);
 #if (NGX_OPENSSL)
 #if (NGX_STAT_STUB)
 (*ngx_stat_active)--;
 #endif
+pool = c->pool;
 ngx_close_connection(c);
+ngx_destroy_pool(c->pool);
 }
 static void ngx_http_client_error(ngx_http_request_t *r,
 int client_error, int error)

Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_request.c @ 28:7ca9bdc82b3f NGINX_0_1_14