Fossil SCM
Fix the previous chance to cover an extra case.
Commit
19a01ac12ea12a158bffb335e181e7fa37f4deb00e8543b692b6cb605d4f561a
Parent
87955d92741f8f0…
1 file changed
+7
-5
+7
-5
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2015,19 +2015,21 @@ | ||
| 2015 | 2015 | @ <h1>Server Configuration Error</h1> |
| 2016 | 2016 | @ <p>The database schema on the server is out-of-date. Please ask |
| 2017 | 2017 | @ the administrator to run <b>fossil rebuild</b>.</p> |
| 2018 | 2018 | } |
| 2019 | 2019 | }else{ |
| 2020 | - static int jsonOnce = 0; | |
| 2021 | 2020 | if(0==(CMDFLAG_LDAVG_EXEMPT & pCmd->eCmdFlags)){ |
| 2022 | 2021 | load_control(); |
| 2023 | 2022 | } |
| 2024 | 2023 | #ifdef FOSSIL_ENABLE_JSON |
| 2025 | - if( jsonOnce==0 && g.json.isJsonMode!=0 ){ | |
| 2026 | - assert(json_is_bootstrapped_early()); | |
| 2027 | - json_bootstrap_late(); | |
| 2028 | - jsonOnce = 1; | |
| 2024 | + { | |
| 2025 | + static int jsonOnce = 0; | |
| 2026 | + if( jsonOnce==0 && g.json.isJsonMode!=0 ){ | |
| 2027 | + assert(json_is_bootstrapped_early()); | |
| 2028 | + json_bootstrap_late(); | |
| 2029 | + jsonOnce = 1; | |
| 2030 | + } | |
| 2029 | 2031 | } |
| 2030 | 2032 | #endif |
| 2031 | 2033 | if( (pCmd->eCmdFlags & CMDFLAG_RAWCONTENT)==0 ){ |
| 2032 | 2034 | cgi_decode_post_parameters(); |
| 2033 | 2035 | } |
| 2034 | 2036 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2015,19 +2015,21 @@ | |
| 2015 | @ <h1>Server Configuration Error</h1> |
| 2016 | @ <p>The database schema on the server is out-of-date. Please ask |
| 2017 | @ the administrator to run <b>fossil rebuild</b>.</p> |
| 2018 | } |
| 2019 | }else{ |
| 2020 | static int jsonOnce = 0; |
| 2021 | if(0==(CMDFLAG_LDAVG_EXEMPT & pCmd->eCmdFlags)){ |
| 2022 | load_control(); |
| 2023 | } |
| 2024 | #ifdef FOSSIL_ENABLE_JSON |
| 2025 | if( jsonOnce==0 && g.json.isJsonMode!=0 ){ |
| 2026 | assert(json_is_bootstrapped_early()); |
| 2027 | json_bootstrap_late(); |
| 2028 | jsonOnce = 1; |
| 2029 | } |
| 2030 | #endif |
| 2031 | if( (pCmd->eCmdFlags & CMDFLAG_RAWCONTENT)==0 ){ |
| 2032 | cgi_decode_post_parameters(); |
| 2033 | } |
| 2034 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2015,19 +2015,21 @@ | |
| 2015 | @ <h1>Server Configuration Error</h1> |
| 2016 | @ <p>The database schema on the server is out-of-date. Please ask |
| 2017 | @ the administrator to run <b>fossil rebuild</b>.</p> |
| 2018 | } |
| 2019 | }else{ |
| 2020 | if(0==(CMDFLAG_LDAVG_EXEMPT & pCmd->eCmdFlags)){ |
| 2021 | load_control(); |
| 2022 | } |
| 2023 | #ifdef FOSSIL_ENABLE_JSON |
| 2024 | { |
| 2025 | static int jsonOnce = 0; |
| 2026 | if( jsonOnce==0 && g.json.isJsonMode!=0 ){ |
| 2027 | assert(json_is_bootstrapped_early()); |
| 2028 | json_bootstrap_late(); |
| 2029 | jsonOnce = 1; |
| 2030 | } |
| 2031 | } |
| 2032 | #endif |
| 2033 | if( (pCmd->eCmdFlags & CMDFLAG_RAWCONTENT)==0 ){ |
| 2034 | cgi_decode_post_parameters(); |
| 2035 | } |
| 2036 |