Fossil SCM
added a FIXME, removed another. Now it's really bed time.
Commit
8b814778c920b9191ac38c3ed2fd1b63619d3e7b
Parent
c6c5ad13644f711…
1 file changed
+5
-9
+5
-9
| --- src/json.c | ||
| +++ src/json.c | ||
| @@ -291,16 +291,16 @@ | ||
| 291 | 291 | ** is owned by the g.json object (one of its sub-objects). Returns |
| 292 | 292 | ** NULL if no match is found. |
| 293 | 293 | ** |
| 294 | 294 | ** ENV means the system environment (getenv()). |
| 295 | 295 | ** |
| 296 | -** Precedence: POST.payload, GET, COOKIE, POST, ENV. | |
| 296 | +** Precedence: POST.payload, GET/COOKIE/non-JSON POST, JSON POST, ENV. | |
| 297 | 297 | ** |
| 298 | -** The precedence SHOULD be: GET, POST.payload, POST, COOKIE, ENV, but | |
| 299 | -** the amalgamation of the GET/POST vars makes it difficult for me to | |
| 300 | -** do that. Since fossil only uses one cookie, cookie precedence isn't | |
| 301 | -** a real/high-priority problem. | |
| 298 | +** FIXME: the precedence SHOULD be: GET, POST.payload, POST, COOKIE, | |
| 299 | +** ENV, but the amalgamation of the GET/POST vars makes it difficult | |
| 300 | +** for me to do that. Since fossil only uses one cookie, cookie | |
| 301 | +** precedence isn't a real/high-priority problem. | |
| 302 | 302 | */ |
| 303 | 303 | cson_value * json_getenv( char const * zKey ){ |
| 304 | 304 | cson_value * rc; |
| 305 | 305 | rc = g.json.reqPayload.o |
| 306 | 306 | ? cson_object_get( g.json.reqPayload.o, zKey ) |
| @@ -1578,14 +1578,10 @@ | ||
| 1578 | 1578 | } |
| 1579 | 1579 | |
| 1580 | 1580 | /* |
| 1581 | 1581 | ** Impl for /json/branch/list |
| 1582 | 1582 | ** |
| 1583 | -** TODO: change how the "range" of branches is specified. | |
| 1584 | -** Take a string arg in the form ("open","all","closed") | |
| 1585 | -** and decide based off of that. | |
| 1586 | -** | |
| 1587 | 1583 | ** |
| 1588 | 1584 | ** CLI mode options: |
| 1589 | 1585 | ** |
| 1590 | 1586 | ** --range X | -r X, where X is one of (open,closed,all) |
| 1591 | 1587 | ** (only the first letter is significant, default=open). |
| 1592 | 1588 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -291,16 +291,16 @@ | |
| 291 | ** is owned by the g.json object (one of its sub-objects). Returns |
| 292 | ** NULL if no match is found. |
| 293 | ** |
| 294 | ** ENV means the system environment (getenv()). |
| 295 | ** |
| 296 | ** Precedence: POST.payload, GET, COOKIE, POST, ENV. |
| 297 | ** |
| 298 | ** The precedence SHOULD be: GET, POST.payload, POST, COOKIE, ENV, but |
| 299 | ** the amalgamation of the GET/POST vars makes it difficult for me to |
| 300 | ** do that. Since fossil only uses one cookie, cookie precedence isn't |
| 301 | ** a real/high-priority problem. |
| 302 | */ |
| 303 | cson_value * json_getenv( char const * zKey ){ |
| 304 | cson_value * rc; |
| 305 | rc = g.json.reqPayload.o |
| 306 | ? cson_object_get( g.json.reqPayload.o, zKey ) |
| @@ -1578,14 +1578,10 @@ | |
| 1578 | } |
| 1579 | |
| 1580 | /* |
| 1581 | ** Impl for /json/branch/list |
| 1582 | ** |
| 1583 | ** TODO: change how the "range" of branches is specified. |
| 1584 | ** Take a string arg in the form ("open","all","closed") |
| 1585 | ** and decide based off of that. |
| 1586 | ** |
| 1587 | ** |
| 1588 | ** CLI mode options: |
| 1589 | ** |
| 1590 | ** --range X | -r X, where X is one of (open,closed,all) |
| 1591 | ** (only the first letter is significant, default=open). |
| 1592 |
| --- src/json.c | |
| +++ src/json.c | |
| @@ -291,16 +291,16 @@ | |
| 291 | ** is owned by the g.json object (one of its sub-objects). Returns |
| 292 | ** NULL if no match is found. |
| 293 | ** |
| 294 | ** ENV means the system environment (getenv()). |
| 295 | ** |
| 296 | ** Precedence: POST.payload, GET/COOKIE/non-JSON POST, JSON POST, ENV. |
| 297 | ** |
| 298 | ** FIXME: the precedence SHOULD be: GET, POST.payload, POST, COOKIE, |
| 299 | ** ENV, but the amalgamation of the GET/POST vars makes it difficult |
| 300 | ** for me to do that. Since fossil only uses one cookie, cookie |
| 301 | ** precedence isn't a real/high-priority problem. |
| 302 | */ |
| 303 | cson_value * json_getenv( char const * zKey ){ |
| 304 | cson_value * rc; |
| 305 | rc = g.json.reqPayload.o |
| 306 | ? cson_object_get( g.json.reqPayload.o, zKey ) |
| @@ -1578,14 +1578,10 @@ | |
| 1578 | } |
| 1579 | |
| 1580 | /* |
| 1581 | ** Impl for /json/branch/list |
| 1582 | ** |
| 1583 | ** |
| 1584 | ** CLI mode options: |
| 1585 | ** |
| 1586 | ** --range X | -r X, where X is one of (open,closed,all) |
| 1587 | ** (only the first letter is significant, default=open). |
| 1588 |