Fossil SCM

In the previous check-in, REQUEST_SCHEMA should be REQUEST_SCHEME - with an "E" at the end, not an "A".

drh 2020-12-12 14:53 trunk
Commit 282bdf01656ebcde7a2bcf0ef3cb449aae17d4d9bb410d64aff3ed19de42fbcd
Parent f101e94da1f8057…
3 files changed +4 -4 +1 -1 +1 -1
~ src/cgi.c ~ src/extcgi.c ~ www/serverext.wiki
M src/cgi.c
+4 -4
--- src/cgi.c
+++ src/cgi.c
@@ -1427,11 +1427,11 @@
14271427
 "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION",
14281428
 "HTTP_CONNECTION", "HTTP_HOST",
14291429
 "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE",
14301430
 "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED",
14311431
 "QUERY_STRING", "REMOTE_ADDR", "REMOTE_PORT",
1432
- "REMOTE_USER", "REQUEST_METHOD", "REQUEST_SCHEMA",
1432
+ "REMOTE_USER", "REQUEST_METHOD", "REQUEST_SCHEME",
14331433
 "REQUEST_URI", "SCRIPT_FILENAME", "SCRIPT_NAME", "SERVER_NAME",
14341434
 "SERVER_PROTOCOL", "HOME", "FOSSIL_HOME", "USERNAME", "USER",
14351435
 "FOSSIL_USER", "SQLITE_TMPDIR", "TMPDIR",
14361436
 "TEMP", "TMP", "FOSSIL_VFS",
14371437
 "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION",
@@ -1662,11 +1662,11 @@
16621662
 ** and subsequent code handles the actual generation of the webpage.
16631663
 */
16641664
 void cgi_handle_http_request(const char *zIpAddr){
16651665
 char *z, *zToken;
16661666
 int i;
1667
- const char *zSchema = "http";
1667
+ const char *zScheme = "http";
16681668
 char zLine[2000]; /* A single line of input. */
16691669
 g.fullHttpReply = 1;
16701670
 if( fgets(zLine, sizeof(zLine),g.httpIn)==0 ){
16711671
 malformed_request("missing HTTP header");
16721672
 }
@@ -1726,11 +1726,11 @@
17261726
 cgi_setenv("CONTENT_TYPE", zVal);
17271727
 }else if( fossil_strcmp(zFieldName,"cookie:")==0 ){
17281728
 cgi_setenv("HTTP_COOKIE", zVal);
17291729
 }else if( fossil_strcmp(zFieldName,"https:")==0 ){
17301730
 cgi_setenv("HTTPS", zVal);
1731
- zSchema = "https";
1731
+ zScheme = "https";
17321732
 }else if( fossil_strcmp(zFieldName,"host:")==0 ){
17331733
 cgi_setenv("HTTP_HOST", zVal);
17341734
 cgi_setenv("SERVER_NAME", zVal);
17351735
 }else if( fossil_strcmp(zFieldName,"if-none-match:")==0 ){
17361736
 cgi_setenv("HTTP_IF_NONE_MATCH", zVal);
@@ -1755,11 +1755,11 @@
17551755
 rangeStart = x1;
17561756
 rangeEnd = x2+1;
17571757
 }
17581758
 }
17591759
 }
1760
- cgi_setenv("REQUEST_SCHEMA",zSchema);
1760
+ cgi_setenv("REQUEST_SCHEME",zScheme);
17611761
 cgi_init();
17621762
 cgi_trace(0);
17631763
 }
17641764
17651765
 /*
17661766
--- src/cgi.c
+++ src/cgi.c
@@ -1427,11 +1427,11 @@
1427 "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION",
1428 "HTTP_CONNECTION", "HTTP_HOST",
1429 "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE",
1430 "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED",
1431 "QUERY_STRING", "REMOTE_ADDR", "REMOTE_PORT",
1432 "REMOTE_USER", "REQUEST_METHOD", "REQUEST_SCHEMA",
1433 "REQUEST_URI", "SCRIPT_FILENAME", "SCRIPT_NAME", "SERVER_NAME",
1434 "SERVER_PROTOCOL", "HOME", "FOSSIL_HOME", "USERNAME", "USER",
1435 "FOSSIL_USER", "SQLITE_TMPDIR", "TMPDIR",
1436 "TEMP", "TMP", "FOSSIL_VFS",
1437 "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION",
@@ -1662,11 +1662,11 @@
1662 ** and subsequent code handles the actual generation of the webpage.
1663 */
1664 void cgi_handle_http_request(const char *zIpAddr){
1665 char *z, *zToken;
1666 int i;
1667 const char *zSchema = "http";
1668 char zLine[2000]; /* A single line of input. */
1669 g.fullHttpReply = 1;
1670 if( fgets(zLine, sizeof(zLine),g.httpIn)==0 ){
1671 malformed_request("missing HTTP header");
1672 }
@@ -1726,11 +1726,11 @@
1726 cgi_setenv("CONTENT_TYPE", zVal);
1727 }else if( fossil_strcmp(zFieldName,"cookie:")==0 ){
1728 cgi_setenv("HTTP_COOKIE", zVal);
1729 }else if( fossil_strcmp(zFieldName,"https:")==0 ){
1730 cgi_setenv("HTTPS", zVal);
1731 zSchema = "https";
1732 }else if( fossil_strcmp(zFieldName,"host:")==0 ){
1733 cgi_setenv("HTTP_HOST", zVal);
1734 cgi_setenv("SERVER_NAME", zVal);
1735 }else if( fossil_strcmp(zFieldName,"if-none-match:")==0 ){
1736 cgi_setenv("HTTP_IF_NONE_MATCH", zVal);
@@ -1755,11 +1755,11 @@
1755 rangeStart = x1;
1756 rangeEnd = x2+1;
1757 }
1758 }
1759 }
1760 cgi_setenv("REQUEST_SCHEMA",zSchema);
1761 cgi_init();
1762 cgi_trace(0);
1763 }
1764
1765 /*
1766
--- src/cgi.c
+++ src/cgi.c
@@ -1427,11 +1427,11 @@
1427 "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION",
1428 "HTTP_CONNECTION", "HTTP_HOST",
1429 "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE",
1430 "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED",
1431 "QUERY_STRING", "REMOTE_ADDR", "REMOTE_PORT",
1432 "REMOTE_USER", "REQUEST_METHOD", "REQUEST_SCHEME",
1433 "REQUEST_URI", "SCRIPT_FILENAME", "SCRIPT_NAME", "SERVER_NAME",
1434 "SERVER_PROTOCOL", "HOME", "FOSSIL_HOME", "USERNAME", "USER",
1435 "FOSSIL_USER", "SQLITE_TMPDIR", "TMPDIR",
1436 "TEMP", "TMP", "FOSSIL_VFS",
1437 "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION",
@@ -1662,11 +1662,11 @@
1662 ** and subsequent code handles the actual generation of the webpage.
1663 */
1664 void cgi_handle_http_request(const char *zIpAddr){
1665 char *z, *zToken;
1666 int i;
1667 const char *zScheme = "http";
1668 char zLine[2000]; /* A single line of input. */
1669 g.fullHttpReply = 1;
1670 if( fgets(zLine, sizeof(zLine),g.httpIn)==0 ){
1671 malformed_request("missing HTTP header");
1672 }
@@ -1726,11 +1726,11 @@
1726 cgi_setenv("CONTENT_TYPE", zVal);
1727 }else if( fossil_strcmp(zFieldName,"cookie:")==0 ){
1728 cgi_setenv("HTTP_COOKIE", zVal);
1729 }else if( fossil_strcmp(zFieldName,"https:")==0 ){
1730 cgi_setenv("HTTPS", zVal);
1731 zScheme = "https";
1732 }else if( fossil_strcmp(zFieldName,"host:")==0 ){
1733 cgi_setenv("HTTP_HOST", zVal);
1734 cgi_setenv("SERVER_NAME", zVal);
1735 }else if( fossil_strcmp(zFieldName,"if-none-match:")==0 ){
1736 cgi_setenv("HTTP_IF_NONE_MATCH", zVal);
@@ -1755,11 +1755,11 @@
1755 rangeStart = x1;
1756 rangeEnd = x2+1;
1757 }
1758 }
1759 }
1760 cgi_setenv("REQUEST_SCHEME",zScheme);
1761 cgi_init();
1762 cgi_trace(0);
1763 }
1764
1765 /*
1766
M src/extcgi.c
+1 -1
--- src/extcgi.c
+++ src/extcgi.c
@@ -67,11 +67,11 @@
6767
 "PATH_INFO",
6868
 "QUERY_STRING",
6969
 "REMOTE_ADDR",
7070
 "REMOTE_USER",
7171
 "REQUEST_METHOD",
72
- "REQUEST_SCHEMA",
72
+ "REQUEST_SCHEME",
7373
 "REQUEST_URI",
7474
 "SCRIPT_DIRECTORY",
7575
 "SCRIPT_FILENAME",
7676
 "SCRIPT_NAME",
7777
 "SERVER_NAME",
7878
--- src/extcgi.c
+++ src/extcgi.c
@@ -67,11 +67,11 @@
67 "PATH_INFO",
68 "QUERY_STRING",
69 "REMOTE_ADDR",
70 "REMOTE_USER",
71 "REQUEST_METHOD",
72 "REQUEST_SCHEMA",
73 "REQUEST_URI",
74 "SCRIPT_DIRECTORY",
75 "SCRIPT_FILENAME",
76 "SCRIPT_NAME",
77 "SERVER_NAME",
78
--- src/extcgi.c
+++ src/extcgi.c
@@ -67,11 +67,11 @@
67 "PATH_INFO",
68 "QUERY_STRING",
69 "REMOTE_ADDR",
70 "REMOTE_USER",
71 "REQUEST_METHOD",
72 "REQUEST_SCHEME",
73 "REQUEST_URI",
74 "SCRIPT_DIRECTORY",
75 "SCRIPT_FILENAME",
76 "SCRIPT_NAME",
77 "SERVER_NAME",
78
M www/serverext.wiki
+1 -1
--- www/serverext.wiki
+++ www/serverext.wiki
@@ -143,11 +143,11 @@
143143
 * PATH_INFO
144144
 * QUERY_STRING
145145
 * REMOTE_ADDR
146146
 * REMOTE_USER
147147
 * REQUEST_METHOD
148
- * REQUEST_SCHEMA
148
+ * REQUEST_SCHEME
149149
 * REQUEST_URI
150150
 * SCRIPT_DIRECTORY
151151
 * SCRIPT_FILENAME
152152
 * SCRIPT_NAME
153153
 * SERVER_NAME
154154
--- www/serverext.wiki
+++ www/serverext.wiki
@@ -143,11 +143,11 @@
143 * PATH_INFO
144 * QUERY_STRING
145 * REMOTE_ADDR
146 * REMOTE_USER
147 * REQUEST_METHOD
148 * REQUEST_SCHEMA
149 * REQUEST_URI
150 * SCRIPT_DIRECTORY
151 * SCRIPT_FILENAME
152 * SCRIPT_NAME
153 * SERVER_NAME
154
--- www/serverext.wiki
+++ www/serverext.wiki
@@ -143,11 +143,11 @@
143 * PATH_INFO
144 * QUERY_STRING
145 * REMOTE_ADDR
146 * REMOTE_USER
147 * REQUEST_METHOD
148 * REQUEST_SCHEME
149 * REQUEST_URI
150 * SCRIPT_DIRECTORY
151 * SCRIPT_FILENAME
152 * SCRIPT_NAME
153 * SERVER_NAME
154

Keyboard Shortcuts

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