Fossil SCM

Change 'NO_JSON' to lowercase. Remove other branch changes that are now superfluous.

mistachkin 2019-08-27 12:51 noJsonCgiFlag
Commit 8baac2646c3ef6ccf70722a6cc07580df874f987c68be68a881724a8fbda942b
Parent 72c721eacf9401f…
3 files changed +1 -1 -5 -9
~ src/cgi.c ~ src/main.c ~ src/winhttp.c
M src/cgi.c
+1 -1
--- src/cgi.c
+++ src/cgi.c
@@ -951,11 +951,11 @@
951951
 const char *zRequestUri = cgi_parameter("REQUEST_URI",0);
952952
 const char *zScriptName = cgi_parameter("SCRIPT_NAME",0);
953953
 const char *zPathInfo = cgi_parameter("PATH_INFO",0);
954954
955955
 #ifdef FOSSIL_ENABLE_JSON
956
- int noJson = P("NO_JSON")!=0;
956
+ int noJson = P("no_json")!=0;
957957
 if( noJson==0 ){ json_main_bootstrap(); }
958958
 #endif
959959
 g.isHTTP = 1;
960960
 cgi_destination(CGI_BODY);
961961
 if( zScriptName==0 ) malformed_request("missing SCRIPT_NAME");
962962
--- src/cgi.c
+++ src/cgi.c
@@ -951,11 +951,11 @@
951 const char *zRequestUri = cgi_parameter("REQUEST_URI",0);
952 const char *zScriptName = cgi_parameter("SCRIPT_NAME",0);
953 const char *zPathInfo = cgi_parameter("PATH_INFO",0);
954
955 #ifdef FOSSIL_ENABLE_JSON
956 int noJson = P("NO_JSON")!=0;
957 if( noJson==0 ){ json_main_bootstrap(); }
958 #endif
959 g.isHTTP = 1;
960 cgi_destination(CGI_BODY);
961 if( zScriptName==0 ) malformed_request("missing SCRIPT_NAME");
962
--- src/cgi.c
+++ src/cgi.c
@@ -951,11 +951,11 @@
951 const char *zRequestUri = cgi_parameter("REQUEST_URI",0);
952 const char *zScriptName = cgi_parameter("SCRIPT_NAME",0);
953 const char *zPathInfo = cgi_parameter("PATH_INFO",0);
954
955 #ifdef FOSSIL_ENABLE_JSON
956 int noJson = P("no_json")!=0;
957 if( noJson==0 ){ json_main_bootstrap(); }
958 #endif
959 g.isHTTP = 1;
960 cgi_destination(CGI_BODY);
961 if( zScriptName==0 ) malformed_request("missing SCRIPT_NAME");
962
M src/main.c
-5
--- src/main.c
+++ src/main.c
@@ -1948,13 +1948,10 @@
19481948
 ** the URL is "/".
19491949
 **
19501950
 ** localauth Grant administrator privileges to connections
19511951
 ** from 127.0.0.1 or ::1.
19521952
 **
1953
-** uppercase_params Allows CGI parameter names to begin with an
1954
-** uppercase letter.
1955
-**
19561953
 ** skin: LABEL Use the built-in skin called LABEL rather than
19571954
 ** the default. If there are no skins called LABEL
19581955
 ** then this line is a no-op.
19591956
 **
19601957
 ** files: GLOBLIST GLOBLIST is a comma-separated list of GLOB
@@ -2301,12 +2298,10 @@
23012298
 ** --host NAME specify hostname of the server
23022299
 ** --https signal a request coming in via https
23032300
 ** --in FILE Take input from FILE instead of standard input
23042301
 ** --ipaddr ADDR Assume the request comes from the given IP address
23052302
 ** --localauth enable automatic login for local connections
2306
-** --cgiupperok Allows CGI parameter names to begin with an uppercase
2307
-** letter.
23082303
 ** --nocompress do not compress HTTP replies
23092304
 ** --nodelay omit backoffice processing if it would delay process exit
23102305
 ** --nojail drop root privilege but do not enter the chroot jail
23112306
 ** --nossl signal that no SSL connections are available
23122307
 ** --notfound URL use URL as "HTTP 404, object not found" page.
23132308
--- src/main.c
+++ src/main.c
@@ -1948,13 +1948,10 @@
1948 ** the URL is "/".
1949 **
1950 ** localauth Grant administrator privileges to connections
1951 ** from 127.0.0.1 or ::1.
1952 **
1953 ** uppercase_params Allows CGI parameter names to begin with an
1954 ** uppercase letter.
1955 **
1956 ** skin: LABEL Use the built-in skin called LABEL rather than
1957 ** the default. If there are no skins called LABEL
1958 ** then this line is a no-op.
1959 **
1960 ** files: GLOBLIST GLOBLIST is a comma-separated list of GLOB
@@ -2301,12 +2298,10 @@
2301 ** --host NAME specify hostname of the server
2302 ** --https signal a request coming in via https
2303 ** --in FILE Take input from FILE instead of standard input
2304 ** --ipaddr ADDR Assume the request comes from the given IP address
2305 ** --localauth enable automatic login for local connections
2306 ** --cgiupperok Allows CGI parameter names to begin with an uppercase
2307 ** letter.
2308 ** --nocompress do not compress HTTP replies
2309 ** --nodelay omit backoffice processing if it would delay process exit
2310 ** --nojail drop root privilege but do not enter the chroot jail
2311 ** --nossl signal that no SSL connections are available
2312 ** --notfound URL use URL as "HTTP 404, object not found" page.
2313
--- src/main.c
+++ src/main.c
@@ -1948,13 +1948,10 @@
1948 ** the URL is "/".
1949 **
1950 ** localauth Grant administrator privileges to connections
1951 ** from 127.0.0.1 or ::1.
1952 **
 
 
 
1953 ** skin: LABEL Use the built-in skin called LABEL rather than
1954 ** the default. If there are no skins called LABEL
1955 ** then this line is a no-op.
1956 **
1957 ** files: GLOBLIST GLOBLIST is a comma-separated list of GLOB
@@ -2301,12 +2298,10 @@
2298 ** --host NAME specify hostname of the server
2299 ** --https signal a request coming in via https
2300 ** --in FILE Take input from FILE instead of standard input
2301 ** --ipaddr ADDR Assume the request comes from the given IP address
2302 ** --localauth enable automatic login for local connections
 
 
2303 ** --nocompress do not compress HTTP replies
2304 ** --nodelay omit backoffice processing if it would delay process exit
2305 ** --nojail drop root privilege but do not enter the chroot jail
2306 ** --nossl signal that no SSL connections are available
2307 ** --notfound URL use URL as "HTTP 404, object not found" page.
2308
M src/winhttp.c
-9
--- src/winhttp.c
+++ src/winhttp.c
@@ -550,13 +550,10 @@
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
- }
558555
 if( g.thTrace ){
559556
 blob_appendf(&options, " --th-trace");
560557
 }
561558
 if( flags & HTTP_SERVER_REPOLIST ){
562559
 blob_appendf(&options, " --repolist");
@@ -987,14 +984,10 @@
987984
 **
988985
 ** Enables automatic login if the --localauth option is present
989986
 ** and the "localauth" setting is off and the connection is from
990987
 ** localhost.
991988
 **
992
-** --cgiupperok
993
-**
994
-** Allows CGI parameter names to begin with an uppercase letter.
995
-**
996989
 ** --repolist
997990
 **
998991
 ** If REPOSITORY is directory, URL "/" lists all repositories.
999992
 **
1000993
 ** --scgi
@@ -1051,11 +1044,10 @@
10511044
 const char *zPassword = find_option("password", "W", 1);
10521045
 const char *zPort = find_option("port", "P", 1);
10531046
 const char *zNotFound = find_option("notfound", 0, 1);
10541047
 const char *zFileGlob = find_option("files", 0, 1);
10551048
 const char *zLocalAuth = find_option("localauth", 0, 0);
1056
- const char *zCgiUpperOk = find_option("cgiupperok", 0, 0);
10571049
 const char *zRepository = find_repository_option();
10581050
 int useSCGI = find_option("scgi", 0, 0)!=0;
10591051
 int allowRepoList = find_option("repolist",0,0)!=0;
10601052
 Blob binPath;
10611053
@@ -1106,11 +1098,10 @@
11061098
 if( useSCGI ) blob_appendf(&binPath, " --scgi");
11071099
 if( allowRepoList ) blob_appendf(&binPath, " --repolist");
11081100
 if( zNotFound ) blob_appendf(&binPath, " --notfound \"%s\"", zNotFound);
11091101
 if( zFileGlob ) blob_appendf(&binPath, " --files-urlenc %T", zFileGlob);
11101102
 if( zLocalAuth ) blob_append(&binPath, " --localauth", -1);
1111
- if( zCgiUpperOk ) blob_append(&binPath, " --cgiupperok", -1);
11121103
 blob_appendf(&binPath, " \"%s\"", g.zRepositoryName);
11131104
 /* Create the service. */
11141105
 hScm = OpenSCManagerW(NULL, NULL, SC_MANAGER_ALL_ACCESS);
11151106
 if( !hScm ) winhttp_fatal("create", zSvcName, win32_get_last_errmsg());
11161107
 hSvc = CreateServiceW(
11171108
--- src/winhttp.c
+++ src/winhttp.c
@@ -550,13 +550,10 @@
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");
@@ -987,14 +984,10 @@
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
@@ -1051,11 +1044,10 @@
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
@@ -1106,11 +1098,10 @@
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
--- src/winhttp.c
+++ src/winhttp.c
@@ -550,13 +550,10 @@
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");
@@ -987,14 +984,10 @@
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
@@ -1051,11 +1044,10 @@
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
@@ -1106,11 +1098,10 @@
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

Keyboard Shortcuts

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