Fossil SCM
The REQUEST_URI CGI parameter should not include the QUERY_STRING.
Commit
5bb921dd0893a5486ff8c5de74cb986a3b168a44e170d4c53ddc11bbf0d75f35
Parent
6325f81d0605d7a…
1 file changed
+1
-1
+1
-1
| --- src/cgi.c | ||
| +++ src/cgi.c | ||
| @@ -1866,14 +1866,14 @@ | ||
| 1866 | 1866 | cgi_setenv("REQUEST_METHOD",zToken); |
| 1867 | 1867 | zToken = extract_token(z, &z); |
| 1868 | 1868 | if( zToken==0 ){ |
| 1869 | 1869 | malformed_request("malformed URL in HTTP header"); |
| 1870 | 1870 | } |
| 1871 | - cgi_setenv("REQUEST_URI", zToken); | |
| 1872 | 1871 | cgi_setenv("SCRIPT_NAME", ""); |
| 1873 | 1872 | for(i=0; zToken[i] && zToken[i]!='?'; i++){} |
| 1874 | 1873 | if( zToken[i] ) zToken[i++] = 0; |
| 1874 | + cgi_setenv("REQUEST_URI", zToken); | |
| 1875 | 1875 | cgi_setenv("PATH_INFO", zToken); |
| 1876 | 1876 | cgi_setenv("QUERY_STRING", &zToken[i]); |
| 1877 | 1877 | if( zIpAddr==0 ){ |
| 1878 | 1878 | zIpAddr = cgi_remote_ip(fileno(g.httpIn)); |
| 1879 | 1879 | } |
| 1880 | 1880 |
| --- src/cgi.c | |
| +++ src/cgi.c | |
| @@ -1866,14 +1866,14 @@ | |
| 1866 | cgi_setenv("REQUEST_METHOD",zToken); |
| 1867 | zToken = extract_token(z, &z); |
| 1868 | if( zToken==0 ){ |
| 1869 | malformed_request("malformed URL in HTTP header"); |
| 1870 | } |
| 1871 | cgi_setenv("REQUEST_URI", zToken); |
| 1872 | cgi_setenv("SCRIPT_NAME", ""); |
| 1873 | for(i=0; zToken[i] && zToken[i]!='?'; i++){} |
| 1874 | if( zToken[i] ) zToken[i++] = 0; |
| 1875 | cgi_setenv("PATH_INFO", zToken); |
| 1876 | cgi_setenv("QUERY_STRING", &zToken[i]); |
| 1877 | if( zIpAddr==0 ){ |
| 1878 | zIpAddr = cgi_remote_ip(fileno(g.httpIn)); |
| 1879 | } |
| 1880 |
| --- src/cgi.c | |
| +++ src/cgi.c | |
| @@ -1866,14 +1866,14 @@ | |
| 1866 | cgi_setenv("REQUEST_METHOD",zToken); |
| 1867 | zToken = extract_token(z, &z); |
| 1868 | if( zToken==0 ){ |
| 1869 | malformed_request("malformed URL in HTTP header"); |
| 1870 | } |
| 1871 | cgi_setenv("SCRIPT_NAME", ""); |
| 1872 | for(i=0; zToken[i] && zToken[i]!='?'; i++){} |
| 1873 | if( zToken[i] ) zToken[i++] = 0; |
| 1874 | cgi_setenv("REQUEST_URI", zToken); |
| 1875 | cgi_setenv("PATH_INFO", zToken); |
| 1876 | cgi_setenv("QUERY_STRING", &zToken[i]); |
| 1877 | if( zIpAddr==0 ){ |
| 1878 | zIpAddr = cgi_remote_ip(fileno(g.httpIn)); |
| 1879 | } |
| 1880 |