comparison src/http/modules/ngx_http_memcached_module.c @ 502:89dc5654117c NGINX_0_7_63

nginx 0.7.63 *) Security: now "/../" are disabled in "Destination" request header line. *) Change: minimum supported OpenSSL version is 0.9.7. *) Change: the "ask" parameter of the "ssl_verify_client" directive was changed to the "optional" parameter and now it checks a client certificate if it was offered. Thanks to Brice Figureau. *) Feature: now the "-V" switch shows TLS SNI support. *) Feature: the $ssl_client_verify variable. Thanks to Brice Figureau. *) Feature: the "ssl_crl" directive. Thanks to Brice Figureau. *) Bugfix: the $ssl_client_cert variable usage corrupted memory; the bug had appeared in 0.7.7. Thanks to Sergey Zhuravlev. *) Feature: now the start cache loader runs in a separate process; this should improve large caches handling. *) Feature: now temporary files and permanent storage area may reside at different file systems. *) Bugfix: nginx counted incorrectly disk cache size. *) Change: now directive "gzip_disable msie6" does not disable gzipping for MSIE 6.0 SV1. *) Bugfix: nginx always added "Vary: Accept-Encoding" response header line, if both "gzip_static" and "gzip_vary" were on. *) Feature: the "proxy" parameter of the "geo" directive. *) Feature: the ngx_http_geoip_module. *) Feature: the "limit_rate_after" directive. Thanks to Ivan Debnar. *) Feature: the "limit_req_log_level" and "limit_conn_log_level" directives. *) Bugfix: now "limit_req" directive conforms to the leaky bucket algorithm. Thanks to Maxim Dounin. *) Bugfix: in ngx_http_limit_req_module. Thanks to Maxim Dounin. *) Bugfix: now nginx allows underscores in a request method. *) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate", "X-Accel-Buffering", and "X-Accel-Charset" lines from backend response header. Thanks to Maxim Dounin. *) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend response header lines; the bug had appeared in 0.7.44. Thanks to Maxim Dounin. *) Feature: the "image_filter_transparency" directive. *) Feature: the "image_filter" directive supports variables for setting size. *) Bugfix: in PNG alpha-channel support in the ngx_http_image_filter_module. *) Bugfix: in transparency support in the ngx_http_image_filter_module. *) Feature: now several "perl_modules" directives may be used. *) Bugfix: ngx_http_perl_module responses did not work in subrequests. *) Bugfix: nginx sent '\0' in a "Location" response header line on MKCOL request. Thanks to Xie Zhenye. *) Bugfix: an "error_page" directive did not redirect a 413 error; the bug had appeared in 0.6.10. *) Bugfix: in memory allocation error handling. Thanks to Maxim Dounin and Kirill A. Korinskiy.
author Igor Sysoev <http://sysoev.ru>
date Mon, 26 Oct 2009 00:00:00 +0300
parents dac47e9ef0d5
children 68c0ae0a4959
comparison
equal deleted inserted replaced
501:dc87c92181c7 502:89dc5654117c
174 174
175 if (ngx_http_set_content_type(r) != NGX_OK) { 175 if (ngx_http_set_content_type(r) != NGX_OK) {
176 return NGX_HTTP_INTERNAL_SERVER_ERROR; 176 return NGX_HTTP_INTERNAL_SERVER_ERROR;
177 } 177 }
178 178
179 mlcf = ngx_http_get_module_loc_conf(r, ngx_http_memcached_module); 179 if (ngx_http_upstream_create(r) != NGX_OK) {
180
181 u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
182 if (u == NULL) {
183 return NGX_HTTP_INTERNAL_SERVER_ERROR; 180 return NGX_HTTP_INTERNAL_SERVER_ERROR;
184 } 181 }
182
183 u = r->upstream;
185 184
186 u->schema.len = sizeof("memcached://") - 1; 185 u->schema.len = sizeof("memcached://") - 1;
187 u->schema.data = (u_char *) "memcached://"; 186 u->schema.data = (u_char *) "memcached://";
188 187
189 u->peer.log = r->connection->log;
190 u->peer.log_error = NGX_ERROR_ERR;
191 #if (NGX_THREADS)
192 u->peer.lock = &r->connection->lock;
193 #endif
194
195 u->output.tag = (ngx_buf_tag_t) &ngx_http_memcached_module; 188 u->output.tag = (ngx_buf_tag_t) &ngx_http_memcached_module;
189
190 mlcf = ngx_http_get_module_loc_conf(r, ngx_http_memcached_module);
196 191
197 u->conf = &mlcf->upstream; 192 u->conf = &mlcf->upstream;
198 193
199 u->create_request = ngx_http_memcached_create_request; 194 u->create_request = ngx_http_memcached_create_request;
200 u->reinit_request = ngx_http_memcached_reinit_request; 195 u->reinit_request = ngx_http_memcached_reinit_request;
201 u->process_header = ngx_http_memcached_process_header; 196 u->process_header = ngx_http_memcached_process_header;
202 u->abort_request = ngx_http_memcached_abort_request; 197 u->abort_request = ngx_http_memcached_abort_request;
203 u->finalize_request = ngx_http_memcached_finalize_request; 198 u->finalize_request = ngx_http_memcached_finalize_request;
204
205 r->upstream = u;
206 199
207 ctx = ngx_palloc(r->pool, sizeof(ngx_http_memcached_ctx_t)); 200 ctx = ngx_palloc(r->pool, sizeof(ngx_http_memcached_ctx_t));
208 if (ctx == NULL) { 201 if (ctx == NULL) {
209 return NGX_HTTP_INTERNAL_SERVER_ERROR; 202 return NGX_HTTP_INTERNAL_SERVER_ERROR;
210 } 203 }
511 { 504 {
512 ngx_http_memcached_loc_conf_t *conf; 505 ngx_http_memcached_loc_conf_t *conf;
513 506
514 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_memcached_loc_conf_t)); 507 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_memcached_loc_conf_t));
515 if (conf == NULL) { 508 if (conf == NULL) {
516 return NGX_CONF_ERROR; 509 return NULL;
517 } 510 }
518 511
519 /* 512 /*
520 * set by ngx_pcalloc(): 513 * set by ngx_pcalloc():
521 * 514 *