nginx-vendor-0-5: src/http/ngx_http_core

comparison src/http/ngx_http_core_module.c @ 322:56675f002600 NGINX_0_5_31

nginx 0.5.31 *) Feature: named locations. *) Feature: the "proxy_store" and "fastcgi_store" directives. *) Feature: the "proxy_store_access" and "fastcgi_store_access" directives.

author	Igor Sysoev <http://sysoev.ru>
date	Wed, 15 Aug 2007 00:00:00 +0400
parents	95d92ec39071
children	7cf404023f50

comparison

equal deleted inserted replaced

-:6762c33c7da8
+:56675f002600
 static ngx_int_t
 ngx_http_core_find_location(ngx_http_request_t *r,
 ngx_array_t *locations, ngx_uint_t regex_start, size_t len)
 {
 ngx_int_t                  n, rc;
-ngx_uint_t                 i, found, noregex;
+ngx_uint_t                 i, found;
 ngx_http_core_loc_conf_t  *clcf, **clcfp;
+#if (NGX_PCRE)
+ngx_uint_t                 noregex;
+#endif
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "find location for \"%V\"", &r->uri);
 found = 0;
+#if (NGX_PCRE)
 noregex = 0;
+#endif
 clcfp = locations->elts;
 for (i = 0; i < locations->nelts; i++) {
+if (clcfp[i]->noname
 #if (NGX_PCRE)
-if (clcfp[i]->regex) {
+|| clcfp[i]->regex
-break;
-}
 #endif
+|| clcfp[i]->named)
-if (clcfp[i]->noname) {
+{
 break;
 }
 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "find location: %s\"%V\"",
 if (len > clcfp[i]->name.len) {
 /* the previous match is longer */
 break;
 }
+found = 1;
 r->loc_conf = clcfp[i]->loc_conf;
+#if (NGX_PCRE)
 noregex = clcfp[i]->noregex;
-found = 1;
+#endif
 }
 }
 if (found) {
 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 /* regex matches */
 for (i = regex_start; i < locations->nelts; i++) {
-if (clcfp[i]->noname) {
+if (!clcfp[i]->regex) {
 break;
 }
 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "find location: ~ \"%V\"", &clcfp[i]->name);
 return NGX_DONE;
 }
+ngx_int_t
+ngx_http_named_location(ngx_http_request_t *r, ngx_str_t *name)
+{
+ngx_uint_t                   i;
+ngx_http_core_srv_conf_t    *cscf;
+ngx_http_core_loc_conf_t   **clcfp;
+ngx_http_core_main_conf_t   *cmcf;
+cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
+clcfp = cscf->locations.elts;
+for (i = cscf->named_start; i < cscf->locations.nelts; i++) {
+if (name->len != clcfp[i]->name.len
+|| ngx_strncmp(name->data, clcfp[i]->name.data, name->len) != 0)
+{
+continue;
+}
+ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+"named location: %V \"%V?%V\"", name, &r->uri, &r->args);
+r->internal = 1;
+r->loc_conf = clcfp[i]->loc_conf;
+ngx_http_update_location_config(r);
+cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+r->phase_handler = cmcf->phase_engine.location_rewrite_index;
+ngx_http_core_run_phases(r);
+return NGX_DONE;
+}
+ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+"could not find name location \"%V\"", name);
+ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+return NGX_DONE;
+}
 ngx_http_cleanup_t *
 ngx_http_cleanup_add(ngx_http_request_t *r, size_t size)
 {
 ngx_http_cleanup_t  *cln;
 ngx_uint_t                   i;
 ngx_conf_t                   pcf;
 ngx_http_module_t           *module;
 ngx_http_conf_ctx_t         *ctx, *http_ctx;
 ngx_http_core_srv_conf_t    *cscf, **cscfp;
+ngx_http_core_loc_conf_t   **clcfp;
 ngx_http_core_main_conf_t   *cmcf;
-#if (NGX_PCRE)
-ngx_http_core_loc_conf_t   **clcfp;
-#endif
 ctx = ngx_pcalloc(cf->pool, sizeof(ngx_http_conf_ctx_t));
 if (ctx == NULL) {
 return NGX_CONF_ERROR;
 }
 }
 ngx_sort(cscf->locations.elts, (size_t) cscf->locations.nelts,
 sizeof(ngx_http_core_loc_conf_t *), ngx_http_core_cmp_locations);
+clcfp = cscf->locations.elts;
 #if (NGX_PCRE)
 cscf->regex_start = cscf->locations.nelts;
-clcfp = cscf->locations.elts;
 for (i = 0; i < cscf->locations.nelts; i++) {
 if (clcfp[i]->regex) {
 cscf->regex_start = i;
 break;
 }
 }
 #endif
+cscf->named_start = cscf->locations.nelts;
+for (i = 0; i < cscf->locations.nelts; i++) {
+if (clcfp[i]->named) {
+cscf->named_start = i;
+break;
+}
+}
 return rv;
 }
 "invalid location modifier \"%V\"", &value[1]);
 return NGX_CONF_ERROR;
 }
 } else {
 clcf->name = value[1];
+if (value[1].data[0] == '@') {
+clcf->named = 1;
+}
 }
 pclcf = pctx->loc_conf[ngx_http_core_module.ctx_index];
 if (pclcf->name.len == 0) {
 if (pclcf->exact_match) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "location \"%V\" could not be inside "
 "the exact location \"%V\"",
+&clcf->name, &pclcf->name);
+return NGX_CONF_ERROR;
+}
+if (pclcf->named) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"location \"%V\" could not be inside "
+"the named location \"%V\"",
 &clcf->name, &pclcf->name);
 return NGX_CONF_ERROR;
 }
 #if (NGX_PCRE)
 ngx_int_t                  rc;
 ngx_http_core_loc_conf_t  *first, *second;
 first = *(ngx_http_core_loc_conf_t **) one;
 second = *(ngx_http_core_loc_conf_t **) two;
+if (first->named && !second->named) {
+/* shift named locations to the end */
+return 1;
+}
+if (!first->named && second->named) {
+/* shift named locations to the end */
+return -1;
+}
+if (first->named && second->named) {
+return ngx_strcmp(first->name.data, second->name.data);
+}
 if (first->noname && !second->noname) {
 /* shift no named locations to the end */
 return 1;
 }
 }
 return NGX_CONF_ERROR;
 }
+if (lcf->named && alias) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"the \"alias\" directive may not be used "
+"inside named location");
+return NGX_CONF_ERROR;
+}
 #if (NGX_PCRE)
 if (lcf->regex && alias) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "the \"alias\" directive may not be used "

Mercurial > hg > nginx-vendor-0-5

comparison src/http/ngx_http_core_module.c @ 322:56675f002600 NGINX_0_5_31