Fossil SCM

More refinements.

mistachkin 2019-08-27 05:55 noJsonCgiFlag
Commit c1f4a84694485ad8f020cf93b2c6bb5f4991b96b1781d47f6249ddd2efd86868
Parent ab0d81f893b1f60…
2 files changed +6 -1 +9
~ src/main.c ~ src/winhttp.c
M src/main.c
+6 -1
--- src/main.c
+++ src/main.c
@@ -731,11 +731,11 @@
731731
 fossil_exit(1);
732732
 }else{
733733
 const char *zChdir = find_option("chdir",0,1);
734734
 g.isHTTP = 0;
735735
 g.rcvid = 0;
736
- g.cgiUpperParamsOk = find_option("cgiupperparamsok", 0, 0)!=0;
736
+ g.cgiUpperParamsOk = find_option("cgiupperok", 0, 0)!=0;
737737
 g.fQuiet = find_option("quiet", 0, 0)!=0;
738738
 g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
739739
 g.fSqlStats = find_option("sqlstats", 0, 0)!=0;
740740
 g.fSystemTrace = find_option("systemtrace", 0, 0)!=0;
741741
 g.fSshTrace = find_option("sshtrace", 0, 0)!=0;
@@ -1949,10 +1949,13 @@
19491949
 ** showing a list of available repositories if
19501950
 ** the URL is "/".
19511951
 **
19521952
 ** localauth Grant administrator privileges to connections
19531953
 ** from 127.0.0.1 or ::1.
1954
+**
1955
+** uppercase_params Allows CGI parameter names to begin with an
1956
+** uppercase letter.
19541957
 **
19551958
 ** skin: LABEL Use the built-in skin called LABEL rather than
19561959
 ** the default. If there are no skins called LABEL
19571960
 ** then this line is a no-op.
19581961
 **
@@ -2308,10 +2311,12 @@
23082311
 ** --host NAME specify hostname of the server
23092312
 ** --https signal a request coming in via https
23102313
 ** --in FILE Take input from FILE instead of standard input
23112314
 ** --ipaddr ADDR Assume the request comes from the given IP address
23122315
 ** --localauth enable automatic login for local connections
2316
+** --cgiupperok Allows CGI parameter names to begin with an uppercase
2317
+** letter.
23132318
 ** --nocompress do not compress HTTP replies
23142319
 ** --nodelay omit backoffice processing if it would delay process exit
23152320
 ** --nojail drop root privilege but do not enter the chroot jail
23162321
 ** --nossl signal that no SSL connections are available
23172322
 ** --notfound URL use URL as "HTTP 404, object not found" page.
23182323
--- src/main.c
+++ src/main.c
@@ -731,11 +731,11 @@
731 fossil_exit(1);
732 }else{
733 const char *zChdir = find_option("chdir",0,1);
734 g.isHTTP = 0;
735 g.rcvid = 0;
736 g.cgiUpperParamsOk = find_option("cgiupperparamsok", 0, 0)!=0;
737 g.fQuiet = find_option("quiet", 0, 0)!=0;
738 g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
739 g.fSqlStats = find_option("sqlstats", 0, 0)!=0;
740 g.fSystemTrace = find_option("systemtrace", 0, 0)!=0;
741 g.fSshTrace = find_option("sshtrace", 0, 0)!=0;
@@ -1949,10 +1949,13 @@
1949 ** showing a list of available repositories if
1950 ** the URL is "/".
1951 **
1952 ** localauth Grant administrator privileges to connections
1953 ** from 127.0.0.1 or ::1.
 
 
 
1954 **
1955 ** skin: LABEL Use the built-in skin called LABEL rather than
1956 ** the default. If there are no skins called LABEL
1957 ** then this line is a no-op.
1958 **
@@ -2308,10 +2311,12 @@
2308 ** --host NAME specify hostname of the server
2309 ** --https signal a request coming in via https
2310 ** --in FILE Take input from FILE instead of standard input
2311 ** --ipaddr ADDR Assume the request comes from the given IP address
2312 ** --localauth enable automatic login for local connections
 
 
2313 ** --nocompress do not compress HTTP replies
2314 ** --nodelay omit backoffice processing if it would delay process exit
2315 ** --nojail drop root privilege but do not enter the chroot jail
2316 ** --nossl signal that no SSL connections are available
2317 ** --notfound URL use URL as "HTTP 404, object not found" page.
2318
--- src/main.c
+++ src/main.c
@@ -731,11 +731,11 @@
731 fossil_exit(1);
732 }else{
733 const char *zChdir = find_option("chdir",0,1);
734 g.isHTTP = 0;
735 g.rcvid = 0;
736 g.cgiUpperParamsOk = find_option("cgiupperok", 0, 0)!=0;
737 g.fQuiet = find_option("quiet", 0, 0)!=0;
738 g.fSqlTrace = find_option("sqltrace", 0, 0)!=0;
739 g.fSqlStats = find_option("sqlstats", 0, 0)!=0;
740 g.fSystemTrace = find_option("systemtrace", 0, 0)!=0;
741 g.fSshTrace = find_option("sshtrace", 0, 0)!=0;
@@ -1949,10 +1949,13 @@
1949 ** showing a list of available repositories if
1950 ** the URL is "/".
1951 **
1952 ** localauth Grant administrator privileges to connections
1953 ** from 127.0.0.1 or ::1.
1954 **
1955 ** uppercase_params Allows CGI parameter names to begin with an
1956 ** uppercase letter.
1957 **
1958 ** skin: LABEL Use the built-in skin called LABEL rather than
1959 ** the default. If there are no skins called LABEL
1960 ** then this line is a no-op.
1961 **
@@ -2308,10 +2311,12 @@
2311 ** --host NAME specify hostname of the server
2312 ** --https signal a request coming in via https
2313 ** --in FILE Take input from FILE instead of standard input
2314 ** --ipaddr ADDR Assume the request comes from the given IP address
2315 ** --localauth enable automatic login for local connections
2316 ** --cgiupperok Allows CGI parameter names to begin with an uppercase
2317 ** letter.
2318 ** --nocompress do not compress HTTP replies
2319 ** --nodelay omit backoffice processing if it would delay process exit
2320 ** --nojail drop root privilege but do not enter the chroot jail
2321 ** --nossl signal that no SSL connections are available
2322 ** --notfound URL use URL as "HTTP 404, object not found" page.
2323
M src/winhttp.c
+9
--- src/winhttp.c
+++ src/winhttp.c
@@ -550,10 +550,13 @@
550550
 blob_appendf(&options, " --files-urlenc %T", zFileGlob);
551551
 }
552552
 if( g.useLocalauth ){
553553
 blob_appendf(&options, " --localauth");
554554
 }
555
+ if( g.cgiUpperParamsOk ){
556
+ blob_appendf(&options, " --cgiupperok");
557
+ }
555558
 if( g.thTrace ){
556559
 blob_appendf(&options, " --th-trace");
557560
 }
558561
 if( flags & HTTP_SERVER_REPOLIST ){
559562
 blob_appendf(&options, " --repolist");
@@ -984,10 +987,14 @@
984987
 **
985988
 ** Enables automatic login if the --localauth option is present
986989
 ** and the "localauth" setting is off and the connection is from
987990
 ** localhost.
988991
 **
992
+** --cgiupperok
993
+**
994
+** Allows CGI parameter names to begin with an uppercase letter.
995
+**
989996
 ** --repolist
990997
 **
991998
 ** If REPOSITORY is directory, URL "/" lists all repositories.
992999
 **
9931000
 ** --scgi
@@ -1044,10 +1051,11 @@
10441051
 const char *zPassword = find_option("password", "W", 1);
10451052
 const char *zPort = find_option("port", "P", 1);
10461053
 const char *zNotFound = find_option("notfound", 0, 1);
10471054
 const char *zFileGlob = find_option("files", 0, 1);
10481055
 const char *zLocalAuth = find_option("localauth", 0, 0);
1056
+ const char *zCgiUpperOk = find_option("cgiupperok", 0, 0);
10491057
 const char *zRepository = find_repository_option();
10501058
 int useSCGI = find_option("scgi", 0, 0)!=0;
10511059
 int allowRepoList = find_option("repolist",0,0)!=0;
10521060
 Blob binPath;
10531061
@@ -1098,10 +1106,11 @@
10981106
 if( useSCGI ) blob_appendf(&binPath, " --scgi");
10991107
 if( allowRepoList ) blob_appendf(&binPath, " --repolist");
11001108
 if( zNotFound ) blob_appendf(&binPath, " --notfound \"%s\"", zNotFound);
11011109
 if( zFileGlob ) blob_appendf(&binPath, " --files-urlenc %T", zFileGlob);
11021110
 if( zLocalAuth ) blob_append(&binPath, " --localauth", -1);
1111
+ if( zCgiUpperOk ) blob_append(&binPath, " --cgiupperok", -1);
11031112
 blob_appendf(&binPath, " \"%s\"", g.zRepositoryName);
11041113
 /* Create the service. */
11051114
 hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
11061115
 if( !hScm ) winhttp_fatal("create", zSvcName, win32_get_last_errmsg());
11071116
 hSvc = CreateServiceW(
11081117
--- src/winhttp.c
+++ src/winhttp.c
@@ -550,10 +550,13 @@
550 blob_appendf(&options, " --files-urlenc %T", zFileGlob);
551 }
552 if( g.useLocalauth ){
553 blob_appendf(&options, " --localauth");
554 }
 
 
 
555 if( g.thTrace ){
556 blob_appendf(&options, " --th-trace");
557 }
558 if( flags & HTTP_SERVER_REPOLIST ){
559 blob_appendf(&options, " --repolist");
@@ -984,10 +987,14 @@
984 **
985 ** Enables automatic login if the --localauth option is present
986 ** and the "localauth" setting is off and the connection is from
987 ** localhost.
988 **
 
 
 
 
989 ** --repolist
990 **
991 ** If REPOSITORY is directory, URL "/" lists all repositories.
992 **
993 ** --scgi
@@ -1044,10 +1051,11 @@
1044 const char *zPassword = find_option("password", "W", 1);
1045 const char *zPort = find_option("port", "P", 1);
1046 const char *zNotFound = find_option("notfound", 0, 1);
1047 const char *zFileGlob = find_option("files", 0, 1);
1048 const char *zLocalAuth = find_option("localauth", 0, 0);
 
1049 const char *zRepository = find_repository_option();
1050 int useSCGI = find_option("scgi", 0, 0)!=0;
1051 int allowRepoList = find_option("repolist",0,0)!=0;
1052 Blob binPath;
1053
@@ -1098,10 +1106,11 @@
1098 if( useSCGI ) blob_appendf(&binPath, " --scgi");
1099 if( allowRepoList ) blob_appendf(&binPath, " --repolist");
1100 if( zNotFound ) blob_appendf(&binPath, " --notfound \"%s\"", zNotFound);
1101 if( zFileGlob ) blob_appendf(&binPath, " --files-urlenc %T", zFileGlob);
1102 if( zLocalAuth ) blob_append(&binPath, " --localauth", -1);
 
1103 blob_appendf(&binPath, " \"%s\"", g.zRepositoryName);
1104 /* Create the service. */
1105 hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
1106 if( !hScm ) winhttp_fatal("create", zSvcName, win32_get_last_errmsg());
1107 hSvc = CreateServiceW(
1108
--- src/winhttp.c
+++ src/winhttp.c
@@ -550,10 +550,13 @@
550 blob_appendf(&options, " --files-urlenc %T", zFileGlob);
551 }
552 if( g.useLocalauth ){
553 blob_appendf(&options, " --localauth");
554 }
555 if( g.cgiUpperParamsOk ){
556 blob_appendf(&options, " --cgiupperok");
557 }
558 if( g.thTrace ){
559 blob_appendf(&options, " --th-trace");
560 }
561 if( flags & HTTP_SERVER_REPOLIST ){
562 blob_appendf(&options, " --repolist");
@@ -984,10 +987,14 @@
987 **
988 ** Enables automatic login if the --localauth option is present
989 ** and the "localauth" setting is off and the connection is from
990 ** localhost.
991 **
992 ** --cgiupperok
993 **
994 ** Allows CGI parameter names to begin with an uppercase letter.
995 **
996 ** --repolist
997 **
998 ** If REPOSITORY is directory, URL "/" lists all repositories.
999 **
1000 ** --scgi
@@ -1044,10 +1051,11 @@
1051 const char *zPassword = find_option("password", "W", 1);
1052 const char *zPort = find_option("port", "P", 1);
1053 const char *zNotFound = find_option("notfound", 0, 1);
1054 const char *zFileGlob = find_option("files", 0, 1);
1055 const char *zLocalAuth = find_option("localauth", 0, 0);
1056 const char *zCgiUpperOk = find_option("cgiupperok", 0, 0);
1057 const char *zRepository = find_repository_option();
1058 int useSCGI = find_option("scgi", 0, 0)!=0;
1059 int allowRepoList = find_option("repolist",0,0)!=0;
1060 Blob binPath;
1061
@@ -1098,10 +1106,11 @@
1106 if( useSCGI ) blob_appendf(&binPath, " --scgi");
1107 if( allowRepoList ) blob_appendf(&binPath, " --repolist");
1108 if( zNotFound ) blob_appendf(&binPath, " --notfound \"%s\"", zNotFound);
1109 if( zFileGlob ) blob_appendf(&binPath, " --files-urlenc %T", zFileGlob);
1110 if( zLocalAuth ) blob_append(&binPath, " --localauth", -1);
1111 if( zCgiUpperOk ) blob_append(&binPath, " --cgiupperok", -1);
1112 blob_appendf(&binPath, " \"%s\"", g.zRepositoryName);
1113 /* Create the service. */
1114 hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
1115 if( !hScm ) winhttp_fatal("create", zSvcName, win32_get_last_errmsg());
1116 hSvc = CreateServiceW(
1117

Keyboard Shortcuts

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