Mercurial > hg > nginx

comparison src/http/modules/ngx_http_memcached_module.c @ 3006:95972b9e790b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ngx_http_upstream_create() to cleanup the previous upstream after internal redirect
author Igor Sysoev <igor@sysoev.ru>
date Mon, 27 Jul 2009 13:25:29 +0000
parents c7d57b539248
children f444f291ed38 fdd0943b277d
comparison
equal deleted inserted replaced
3005:5bc8811728f8 3006:95972b9e790b
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 }