fixed --static-index when methods different from GET/HEAD are in place

unbit · Mar 10, 2013 · 5631dca · 5631dca
1 parent 3f731e2
commit 5631dca
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/core/protocol.c b/core/protocol.c
@@ -759,12 +759,7 @@ int uwsgi_parse_vars(struct wsgi_request *wsgi_req) {
 	}
 
 
-	// check for static files
-
-	// skip methods other than GET and HEAD
-	if (uwsgi_strncmp(wsgi_req->method, wsgi_req->method_len, "GET", 3) && uwsgi_strncmp(wsgi_req->method, wsgi_req->method_len, "HEAD", 4)) {
-		return 0;
-	}
+	/* CHECK FOR STATIC FILES */
 
 	// skip extensions
 	struct uwsgi_string_list *sse = uwsgi.static_skip_ext;

diff --git a/core/static.c b/core/static.c
@@ -582,6 +582,16 @@ int uwsgi_file_serve(struct wsgi_request *wsgi_req, char *document_root, uint16_
 
 	if (!uwsgi_static_stat(real_filename, &real_filename_len, &st)) {
 
+		// skip methods other than GET and HEAD
+        	if (uwsgi_strncmp(wsgi_req->method, wsgi_req->method_len, "GET", 3) && uwsgi_strncmp(wsgi_req->method, wsgi_req->method_len, "HEAD", 4)) {
+#ifdef UWSGI_ROUTING
+			if (uwsgi_apply_routes_fast(wsgi_req, real_filename, real_filename_len) == UWSGI_ROUTE_BREAK)
+				return 0;
+#endif
+			return -1;
+        	}
+
+
 		// check for skippable ext
 		struct uwsgi_string_list *sse = uwsgi.static_skip_ext;
 		while (sse) {