fix routing - remove script name from request uri

s2x · Jan 27, 2015 · 05eb28e · 05eb28e
1 parent dca3944
commit 05eb28e
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 11 deletions.
diff --git a/.cproject b/.cproject
@@ -5,20 +5,20 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1537295155" moduleId="org.eclipse.cdt.core.settings" name="Build (GNU)">
 				<externalSettings/>
 				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.core.buildArtefactType.autotools" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1537295155" name="Build (GNU)" parent="org.eclipse.linuxtools.cdt.autotools.core.configuration.build">
 					<folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1537295155." name="/" resourcePath="">
 						<toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.716718361" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
 							<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.212784029" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/>
-							<builder arguments="-j8" command="make" id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.2082580609" keepEnvironmentInBuildfile="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
+							<builder arguments="-j4" autoBuildTarget="" cleanBuildTarget="" command="make" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.2082580609" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
 							<tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.209936929" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
 								<option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.470600626" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1537295155" valueType="string"/>
 							</tool>
@@ -47,10 +47,10 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Default">
+		<configuration configurationName="Build (GNU)">
 			<resource resourceType="PROJECT" workspacePath="/ccframework"/>
 		</configuration>
-		<configuration configurationName="Build (GNU)">
+		<configuration configurationName="Default">
 			<resource resourceType="PROJECT" workspacePath="/ccframework"/>
 		</configuration>
 	</storageModule>

diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,7 @@ Makefile
 /po/stamp-it
 /libtool
 /stamp-h1
-
+/src/test/query_test
 #anjuta 
 .anjuta/
 .anjuta_sym_db.db
@@ -34,3 +34,4 @@ Makefile
 *.dirstamp
 *.pc
 
+/config.h.in~
diff --git a/src/ccframework/ccApp.cc b/src/ccframework/ccApp.cc
@@ -88,6 +88,7 @@ ccResponse *ccApp::processRequest(FCGX_Request fcgi_request) {
 				ctemplate::TemplateCache::LAZY_RELOAD);
 
 	}
+
 	//proces fastcgi headers
 	this->request = new ccRequest(fcgi_request);
 

diff --git a/src/ccframework/router/ccPregRoute.cc b/src/ccframework/router/ccPregRoute.cc
@@ -19,8 +19,7 @@ bool ccPregRoute::match(ccRequest *request) {
 
 	this->request_params.clear();
 
-	std::string request_uri = request->getEnvParamter("REDIRECT_URL",
-			request->getEnvParamter("REQUEST_URI"));
+	std::string request_uri = this->getFixedRequestUri(request);
 	request_uri = request_uri.substr(0, request_uri.find_first_of("?"));
 
 	rc = pcre_exec(this->re, NULL, request_uri.c_str(), request_uri.length(), 0,

diff --git a/src/ccframework/router/ccRoute.cc b/src/ccframework/router/ccRoute.cc
@@ -92,6 +92,25 @@ std::string ccRoute::getUrl(std::map<std::string, std::string> params) {
 	return this->pattern;
 }
 
+std::string ccRoute::getFixedRequestUri(ccRequest* request) {
+	std::string request_uri = request->getEnvParamter("REDIRECT_URL",
+			request->getEnvParamter("REQUEST_URI"));
+	std::string script_name = request->getEnvParamter("SCRIPT_NAME");
+
+
+    if (script_name!="") {
+        if (request_uri.find(script_name)==0) {
+            request_uri = request_uri.substr(script_name.length());
+        }
+    }
+
+    if (request_uri.find("/") == std::string::npos) {
+        request_uri = "/"+request_uri;
+    }
+
+    return request_uri;
+}
+
 } /* namespace ccFramework */
 
 
diff --git a/src/ccframework/router/ccStaticRoute.cc b/src/ccframework/router/ccStaticRoute.cc
@@ -11,11 +11,12 @@
 namespace ccFramework {
 
 bool ccStaticRoute::match(ccRequest* request) {
+
 	this->request_params.clear();
-	std::string request_uri = request->getEnvParamter("REDIRECT_URL",
-			request->getEnvParamter("REQUEST_URI"));
-	request_uri = request_uri.substr(0, request_uri.find_first_of("?"));
+    std::string request_uri = this->getFixedRequestUri(request);
 
+	request_uri = request_uri.substr(0, request_uri.find_first_of("?"));
+
 	if (request_uri.compare(this->pattern)==0) {
 		return true;
 	}

diff --git a/src/include/ccframework/ccRoute.h b/src/include/ccframework/ccRoute.h
@@ -24,6 +24,7 @@ class ccRoute {
 
 	virtual bool match(ccRequest *request);
 
+    std::string getFixedRequestUri(ccRequest* request);
 
 	//if is active route then get paramters
 	bool hasRouteParameter(std::string name);
-Original file line number
+Diff line change
@@ Expand Up @@
     				ctemplate::TemplateCache::LAZY_RELOAD);
     	}
     	//proces fastcgi headers
     	this->request = new ccRequest(fcgi_request);
@@ Expand Down @@