add 'raw_uri' built-in variable for original request URI but without …

…arguments
Wiphone · Sep 18, 2013 · 1584a3f · 1584a3f
1 parent bd5601d
commit 1584a3f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
@@ -795,6 +795,15 @@ ngx_http_process_request_line(ngx_event_t *rev)
             }
 
 
+            if (r->args_start) {
+                r->raw_uri.len = r->args_start - 1 - r->uri_start;
+
+            } else {
+                r->raw_uri.len = r->uri_end - r->uri_start;
+            }
+            r->raw_uri.data = r->uri_start;
+
+
             r->unparsed_uri.len = r->uri_end - r->uri_start;
             r->unparsed_uri.data = r->uri_start;
 

diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
@@ -401,6 +401,7 @@ struct ngx_http_request_s {
     ngx_uint_t                        http_version;
 
     ngx_str_t                         request_line;
+    ngx_str_t                         raw_uri;
     ngx_str_t                         uri;
     ngx_str_t                         args;
     ngx_str_t                         exten;

diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c
@@ -218,6 +218,10 @@ static ngx_http_variable_t  ngx_http_core_variables[] = {
     { ngx_string("request_uri"), NULL, ngx_http_variable_request,
       offsetof(ngx_http_request_t, unparsed_uri), 0, 0 },
 
+    { ngx_string("raw_uri"), NULL, ngx_http_variable_request,
+      offsetof(ngx_http_request_t, raw_uri),
+      NGX_HTTP_VAR_NOCACHEABLE, 0 },
+
     { ngx_string("uri"), NULL, ngx_http_variable_request,
       offsetof(ngx_http_request_t, uri),
       NGX_HTTP_VAR_NOCACHEABLE, 0 },