Fossil SCM

Fix the CGI so that it works again with Apache.

drh 2013-08-15 03:43 trunk
Commit d01b3c953fefc6f610a9a66229aef110cc96438a
1 file changed +2 -7
+2 -7
--- src/cgi.c
+++ src/cgi.c
@@ -837,17 +837,12 @@
837837
if( zRequestUri==0 ) malformed_request("missing REQUEST_URI");
838838
if( zScriptName==0 ) malformed_request("missing SCRIPT_NAME");
839839
if( cgi_parameter("PATH_INFO",0)==0 ){
840840
int i, j;
841841
for(i=0; zRequestUri[i]==zScriptName[i] && zRequestUri[i]; i++){}
842
- if( zRequestUri[i]=='/' ){
843
- for(j=i; zRequestUri[j] && zRequestUri[j]!='?'; j++){}
844
- cgi_set_parameter("PATH_INFO", mprintf("%.*s", j-i, zRequestUri+i));
845
- }else{
846
- malformed_request("cannot compute PATH_INFO from REQUEST_URI"
847
- " and SCRIPT_NAME");
848
- }
842
+ for(j=i; zRequestUri[j] && zRequestUri[j]!='?'; j++){}
843
+ cgi_set_parameter("PATH_INFO", mprintf("%.*s", j-i, zRequestUri+i));
849844
}
850845
851846
z = (char*)P("HTTP_COOKIE");
852847
if( z ){
853848
z = mprintf("%s",z);
854849
--- src/cgi.c
+++ src/cgi.c
@@ -837,17 +837,12 @@
837 if( zRequestUri==0 ) malformed_request("missing REQUEST_URI");
838 if( zScriptName==0 ) malformed_request("missing SCRIPT_NAME");
839 if( cgi_parameter("PATH_INFO",0)==0 ){
840 int i, j;
841 for(i=0; zRequestUri[i]==zScriptName[i] && zRequestUri[i]; i++){}
842 if( zRequestUri[i]=='/' ){
843 for(j=i; zRequestUri[j] && zRequestUri[j]!='?'; j++){}
844 cgi_set_parameter("PATH_INFO", mprintf("%.*s", j-i, zRequestUri+i));
845 }else{
846 malformed_request("cannot compute PATH_INFO from REQUEST_URI"
847 " and SCRIPT_NAME");
848 }
849 }
850
851 z = (char*)P("HTTP_COOKIE");
852 if( z ){
853 z = mprintf("%s",z);
854
--- src/cgi.c
+++ src/cgi.c
@@ -837,17 +837,12 @@
837 if( zRequestUri==0 ) malformed_request("missing REQUEST_URI");
838 if( zScriptName==0 ) malformed_request("missing SCRIPT_NAME");
839 if( cgi_parameter("PATH_INFO",0)==0 ){
840 int i, j;
841 for(i=0; zRequestUri[i]==zScriptName[i] && zRequestUri[i]; i++){}
842 for(j=i; zRequestUri[j] && zRequestUri[j]!='?'; j++){}
843 cgi_set_parameter("PATH_INFO", mprintf("%.*s", j-i, zRequestUri+i));
 
 
 
 
 
844 }
845
846 z = (char*)P("HTTP_COOKIE");
847 if( z ){
848 z = mprintf("%s",z);
849

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button