Fix Nginx sub-URI support.

phusion · Feb 19, 2013 · ca2866c · ca2866c
1 parent 8ef3c57
commit ca2866c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ext/common/ApplicationPool2/AppTypes.cpp b/ext/common/ApplicationPool2/AppTypes.cpp
@@ -54,10 +54,10 @@ passenger_app_type_detector_free(PassengerAppTypeDetector *detector) {
 
 PassengerAppType
 passenger_app_type_detector_check_document_root(PassengerAppTypeDetector *_detector,
-	const char *documentRoot, unsigned int len, int resolveSymlinks)
+	const char *documentRoot, unsigned int len, int resolveFirstSymlink)
 {
 	AppTypeDetector *detector = (AppTypeDetector *) _detector;
-	return detector->checkDocumentRoot(StaticString(documentRoot, len), resolveSymlinks);
+	return detector->checkDocumentRoot(StaticString(documentRoot, len), resolveFirstSymlink);
 }
 
 PassengerAppType

diff --git a/ext/common/ApplicationPool2/AppTypes.h b/ext/common/ApplicationPool2/AppTypes.h
@@ -41,7 +41,7 @@ typedef void PassengerAppTypeDetector;
 PassengerAppTypeDetector *passenger_app_type_detector_new();
 void passenger_app_type_detector_free(PassengerAppTypeDetector *detector);
 PassengerAppType passenger_app_type_detector_check_document_root(PassengerAppTypeDetector *detector,
-	const char *documentRoot, unsigned int len, int resolveSymlinks);
+	const char *documentRoot, unsigned int len, int resolveFirstSymlink);
 PassengerAppType passenger_app_type_detector_check_app_root(PassengerAppTypeDetector *detector,
 	const char *appRoot, unsigned int len);
 
@@ -114,8 +114,8 @@ class AppTypeDetector {
 		}
 	}
 
-	PassengerAppType checkDocumentRoot(const StaticString &documentRoot, bool resolveSymlinks = false) {
-		if (OXT_UNLIKELY(resolveSymlinks)) {
+	PassengerAppType checkDocumentRoot(const StaticString &documentRoot, bool resolveFirstSymlink = false) {
+		if (!resolveFirstSymlink) {
 			char ntDocRoot[documentRoot.size() + 1];
 			memcpy(ntDocRoot, documentRoot.data(), documentRoot.size());
 			ntDocRoot[documentRoot.size()] = '\0';

diff --git a/ext/nginx/ContentHandler.c b/ext/nginx/ContentHandler.c
@@ -1356,7 +1356,7 @@ passenger_content_handler(ngx_http_request_t *r)
         context->app_type = passenger_app_type_detector_check_document_root(
             passenger_app_type_detector,
             (const char *) context->public_dir.data, context->public_dir.len,
-            0);
+            context->base_uri.len != 0);
     } else {
         context->app_type = passenger_app_type_detector_check_app_root(
             passenger_app_type_detector,