Fossil SCM
Merge updates from trunk.
Commit
cb881aab33c0a88520f27d760d896d696a4f185ea9e6330db167d14b3f7496b8
Parent
0fe4c7d97377e56…
2 files changed
+2
-2
+2
-2
+2
-2
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -1035,11 +1035,11 @@ | ||
| 1035 | 1035 | int showAll; |
| 1036 | 1036 | char *zErr = 0; |
| 1037 | 1037 | int isAuth = 0; |
| 1038 | 1038 | char zCap[100]; |
| 1039 | 1039 | static const char *const azCgiVars[] = { |
| 1040 | - "COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE", | |
| 1040 | + "COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE", "SCGI", | |
| 1041 | 1041 | "HTTP_ACCEPT", "HTTP_ACCEPT_CHARSET", "HTTP_ACCEPT_ENCODING", |
| 1042 | 1042 | "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION", |
| 1043 | 1043 | "HTTP_CONNECTION", "HTTP_HOST", |
| 1044 | 1044 | "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE", |
| 1045 | 1045 | "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED", |
| @@ -1049,11 +1049,11 @@ | ||
| 1049 | 1049 | "HOME", "FOSSIL_HOME", "USERNAME", "USER", "FOSSIL_USER", |
| 1050 | 1050 | "SQLITE_TMPDIR", "TMPDIR", |
| 1051 | 1051 | "TEMP", "TMP", "FOSSIL_VFS", |
| 1052 | 1052 | "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION", |
| 1053 | 1053 | "FOSSIL_TCL_PATH", "TH1_DELETE_INTERP", "TH1_ENABLE_DOCS", |
| 1054 | - "TH1_ENABLE_HOOKS", "TH1_ENABLE_TCL", "REMOTE_HOST" | |
| 1054 | + "TH1_ENABLE_HOOKS", "TH1_ENABLE_TCL", "REMOTE_HOST", | |
| 1055 | 1055 | }; |
| 1056 | 1056 | |
| 1057 | 1057 | login_check_credentials(); |
| 1058 | 1058 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 1059 | 1059 | isAuth = 1; |
| 1060 | 1060 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1035,11 +1035,11 @@ | |
| 1035 | int showAll; |
| 1036 | char *zErr = 0; |
| 1037 | int isAuth = 0; |
| 1038 | char zCap[100]; |
| 1039 | static const char *const azCgiVars[] = { |
| 1040 | "COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE", |
| 1041 | "HTTP_ACCEPT", "HTTP_ACCEPT_CHARSET", "HTTP_ACCEPT_ENCODING", |
| 1042 | "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION", |
| 1043 | "HTTP_CONNECTION", "HTTP_HOST", |
| 1044 | "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE", |
| 1045 | "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED", |
| @@ -1049,11 +1049,11 @@ | |
| 1049 | "HOME", "FOSSIL_HOME", "USERNAME", "USER", "FOSSIL_USER", |
| 1050 | "SQLITE_TMPDIR", "TMPDIR", |
| 1051 | "TEMP", "TMP", "FOSSIL_VFS", |
| 1052 | "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION", |
| 1053 | "FOSSIL_TCL_PATH", "TH1_DELETE_INTERP", "TH1_ENABLE_DOCS", |
| 1054 | "TH1_ENABLE_HOOKS", "TH1_ENABLE_TCL", "REMOTE_HOST" |
| 1055 | }; |
| 1056 | |
| 1057 | login_check_credentials(); |
| 1058 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 1059 | isAuth = 1; |
| 1060 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1035,11 +1035,11 @@ | |
| 1035 | int showAll; |
| 1036 | char *zErr = 0; |
| 1037 | int isAuth = 0; |
| 1038 | char zCap[100]; |
| 1039 | static const char *const azCgiVars[] = { |
| 1040 | "COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE", "SCGI", |
| 1041 | "HTTP_ACCEPT", "HTTP_ACCEPT_CHARSET", "HTTP_ACCEPT_ENCODING", |
| 1042 | "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION", |
| 1043 | "HTTP_CONNECTION", "HTTP_HOST", |
| 1044 | "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE", |
| 1045 | "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED", |
| @@ -1049,11 +1049,11 @@ | |
| 1049 | "HOME", "FOSSIL_HOME", "USERNAME", "USER", "FOSSIL_USER", |
| 1050 | "SQLITE_TMPDIR", "TMPDIR", |
| 1051 | "TEMP", "TMP", "FOSSIL_VFS", |
| 1052 | "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION", |
| 1053 | "FOSSIL_TCL_PATH", "TH1_DELETE_INTERP", "TH1_ENABLE_DOCS", |
| 1054 | "TH1_ENABLE_HOOKS", "TH1_ENABLE_TCL", "REMOTE_HOST", |
| 1055 | }; |
| 1056 | |
| 1057 | login_check_credentials(); |
| 1058 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 1059 | isAuth = 1; |
| 1060 |
+2
-2
| --- src/style.c | ||
| +++ src/style.c | ||
| @@ -1035,11 +1035,11 @@ | ||
| 1035 | 1035 | int showAll; |
| 1036 | 1036 | char *zErr = 0; |
| 1037 | 1037 | int isAuth = 0; |
| 1038 | 1038 | char zCap[100]; |
| 1039 | 1039 | static const char *const azCgiVars[] = { |
| 1040 | - "COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE", | |
| 1040 | + "COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE", "SCGI", | |
| 1041 | 1041 | "HTTP_ACCEPT", "HTTP_ACCEPT_CHARSET", "HTTP_ACCEPT_ENCODING", |
| 1042 | 1042 | "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION", |
| 1043 | 1043 | "HTTP_CONNECTION", "HTTP_HOST", |
| 1044 | 1044 | "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE", |
| 1045 | 1045 | "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED", |
| @@ -1049,11 +1049,11 @@ | ||
| 1049 | 1049 | "HOME", "FOSSIL_HOME", "USERNAME", "USER", "FOSSIL_USER", |
| 1050 | 1050 | "SQLITE_TMPDIR", "TMPDIR", |
| 1051 | 1051 | "TEMP", "TMP", "FOSSIL_VFS", |
| 1052 | 1052 | "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION", |
| 1053 | 1053 | "FOSSIL_TCL_PATH", "TH1_DELETE_INTERP", "TH1_ENABLE_DOCS", |
| 1054 | - "TH1_ENABLE_HOOKS", "TH1_ENABLE_TCL", "REMOTE_HOST" | |
| 1054 | + "TH1_ENABLE_HOOKS", "TH1_ENABLE_TCL", "REMOTE_HOST", | |
| 1055 | 1055 | }; |
| 1056 | 1056 | |
| 1057 | 1057 | login_check_credentials(); |
| 1058 | 1058 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 1059 | 1059 | isAuth = 1; |
| 1060 | 1060 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1035,11 +1035,11 @@ | |
| 1035 | int showAll; |
| 1036 | char *zErr = 0; |
| 1037 | int isAuth = 0; |
| 1038 | char zCap[100]; |
| 1039 | static const char *const azCgiVars[] = { |
| 1040 | "COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE", |
| 1041 | "HTTP_ACCEPT", "HTTP_ACCEPT_CHARSET", "HTTP_ACCEPT_ENCODING", |
| 1042 | "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION", |
| 1043 | "HTTP_CONNECTION", "HTTP_HOST", |
| 1044 | "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE", |
| 1045 | "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED", |
| @@ -1049,11 +1049,11 @@ | |
| 1049 | "HOME", "FOSSIL_HOME", "USERNAME", "USER", "FOSSIL_USER", |
| 1050 | "SQLITE_TMPDIR", "TMPDIR", |
| 1051 | "TEMP", "TMP", "FOSSIL_VFS", |
| 1052 | "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION", |
| 1053 | "FOSSIL_TCL_PATH", "TH1_DELETE_INTERP", "TH1_ENABLE_DOCS", |
| 1054 | "TH1_ENABLE_HOOKS", "TH1_ENABLE_TCL", "REMOTE_HOST" |
| 1055 | }; |
| 1056 | |
| 1057 | login_check_credentials(); |
| 1058 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 1059 | isAuth = 1; |
| 1060 |
| --- src/style.c | |
| +++ src/style.c | |
| @@ -1035,11 +1035,11 @@ | |
| 1035 | int showAll; |
| 1036 | char *zErr = 0; |
| 1037 | int isAuth = 0; |
| 1038 | char zCap[100]; |
| 1039 | static const char *const azCgiVars[] = { |
| 1040 | "COMSPEC", "DOCUMENT_ROOT", "GATEWAY_INTERFACE", "SCGI", |
| 1041 | "HTTP_ACCEPT", "HTTP_ACCEPT_CHARSET", "HTTP_ACCEPT_ENCODING", |
| 1042 | "HTTP_ACCEPT_LANGUAGE", "HTTP_AUTHENICATION", |
| 1043 | "HTTP_CONNECTION", "HTTP_HOST", |
| 1044 | "HTTP_IF_NONE_MATCH", "HTTP_IF_MODIFIED_SINCE", |
| 1045 | "HTTP_USER_AGENT", "HTTP_REFERER", "PATH_INFO", "PATH_TRANSLATED", |
| @@ -1049,11 +1049,11 @@ | |
| 1049 | "HOME", "FOSSIL_HOME", "USERNAME", "USER", "FOSSIL_USER", |
| 1050 | "SQLITE_TMPDIR", "TMPDIR", |
| 1051 | "TEMP", "TMP", "FOSSIL_VFS", |
| 1052 | "FOSSIL_FORCE_TICKET_MODERATION", "FOSSIL_FORCE_WIKI_MODERATION", |
| 1053 | "FOSSIL_TCL_PATH", "TH1_DELETE_INTERP", "TH1_ENABLE_DOCS", |
| 1054 | "TH1_ENABLE_HOOKS", "TH1_ENABLE_TCL", "REMOTE_HOST", |
| 1055 | }; |
| 1056 | |
| 1057 | login_check_credentials(); |
| 1058 | if( g.perm.Admin || g.perm.Setup || db_get_boolean("test_env_enable",0) ){ |
| 1059 | isAuth = 1; |
| 1060 |