diff options
Diffstat (limited to 'src/sledjchisl')
-rw-r--r-- | src/sledjchisl/sledjchisl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c index 60102f3..d53e5b5 100644 --- a/src/sledjchisl/sledjchisl.c +++ b/src/sledjchisl/sledjchisl.c | |||
@@ -65,6 +65,7 @@ extern char **environ; | |||
65 | #include <uuid/uuid.h> | 65 | #include <uuid/uuid.h> |
66 | 66 | ||
67 | // Toybox's strend overrides another strend that causes MariaDB library to crash. Renaming it to tb_strend helps. | 67 | // Toybox's strend overrides another strend that causes MariaDB library to crash. Renaming it to tb_strend helps. |
68 | // I deal with that by using a sed invokation when building toybox. | ||
68 | #include "toys.h" | 69 | #include "toys.h" |
69 | 70 | ||
70 | 71 | ||
@@ -226,8 +227,6 @@ size_t qB64_decode(char *str) { | |||
226 | } | 227 | } |
227 | 228 | ||
228 | 229 | ||
229 | |||
230 | |||
231 | // Duplicate some small amount of code from toys/pending/sh.c | 230 | // Duplicate some small amount of code from toys/pending/sh.c |
232 | int runToy(char *argv[]) | 231 | int runToy(char *argv[]) |
233 | { | 232 | { |
@@ -462,7 +461,7 @@ qhashtbl_t *mimeTypes; | |||
462 | 461 | ||
463 | 462 | ||
464 | // TODO - log to file. The problem is we don't know where to log until after we have loaded the configs, and before that we are spewing log messages. | 463 | // TODO - log to file. The problem is we don't know where to log until after we have loaded the configs, and before that we are spewing log messages. |
465 | // Now that we are using spawn-fcgi, all the logs are going to STDOUT, which we can capture and write to a file. | 464 | // Now that we are using spawn-fcgi, all the logs are going to STDERR, which we can capture and write to a file. |
466 | // A better idea, when we spawn tmux or spawn-fcgi, capture STDERR, full log everything to that, filtered log to the tmux console (STDOUT). | 465 | // A better idea, when we spawn tmux or spawn-fcgi, capture STDERR, full log everything to that, filtered log to the tmux console (STDOUT). |
467 | // Then we can use STDOUT / STDIN to run the console stuff. | 466 | // Then we can use STDOUT / STDIN to run the console stuff. |
468 | 467 | ||
@@ -728,6 +727,7 @@ char *getSimName(char *sim) | |||
728 | do | 727 | do |
729 | { | 728 | { |
730 | // TODO - get_line() is slow, and wont help much with DOS and Mac line endings. | 729 | // TODO - get_line() is slow, and wont help much with DOS and Mac line endings. |
730 | // gio_gets() isn't any faster really, but deals with DOS line endings at least. | ||
731 | temp = get_line(fd); | 731 | temp = get_line(fd); |
732 | if (temp) | 732 | if (temp) |
733 | { | 733 | { |
@@ -2545,7 +2545,7 @@ HTMLfile *checkHTMLcache(char *file) | |||
2545 | . Let them do things as normal, in case this was just someone being mean to them, coz their email addy might be public. | 2545 | . Let them do things as normal, in case this was just someone being mean to them, coz their email addy might be public. |
2546 | . Including the usual logging out and in again with their old password. | 2546 | . Including the usual logging out and in again with their old password. |
2547 | . Warn them on login and any page refresh that there is an outstanding password reset awaiting them. | 2547 | . Warn them on login and any page refresh that there is an outstanding password reset awaiting them. |
2548 | email linky, which is some or all of the token result bits strung together, BASE64 encode the result. | 2548 | + email linky, which is some or all of the token result bits strung together, BASE64 encode the result. |
2549 | . regenerate the usual token | 2549 | . regenerate the usual token |
2550 | . user clicks on the linky (or just enters the linky in a field) | 2550 | . user clicks on the linky (or just enters the linky in a field) |
2551 | . validate the linky token. | 2551 | . validate the linky token. |
@@ -4820,7 +4820,7 @@ T("BODY"); | |||
4820 | Rd->Rheaders->putstr(Rd->Rheaders, "X-XSS-Protection", "1;mode=block"); | 4820 | Rd->Rheaders->putstr(Rd->Rheaders, "X-XSS-Protection", "1;mode=block"); |
4821 | Rd->Rheaders->putstr(Rd->Rheaders, "X-Frame-Options", "SAMEORIGIN"); | 4821 | Rd->Rheaders->putstr(Rd->Rheaders, "X-Frame-Options", "SAMEORIGIN"); |
4822 | Rd->Rheaders->putstr(Rd->Rheaders, "X-Content-Type-Options", "nosniff"); | 4822 | Rd->Rheaders->putstr(Rd->Rheaders, "X-Content-Type-Options", "nosniff"); |
4823 | // Failed experiment. | 4823 | // Failed experiment, looks like JavaScript is the only way to change headers for the session ID. |
4824 | // Rd->Rheaders->putstr(Rd->Rheaders, "X-Toke-N-Munchie", "foo, bar"); | 4824 | // Rd->Rheaders->putstr(Rd->Rheaders, "X-Toke-N-Munchie", "foo, bar"); |
4825 | 4825 | ||
4826 | if ((strcmp("GET", Rd->Method) != 0) && (strcmp("HEAD", Rd->Method) != 0) && (strcmp("POST", Rd->Method) != 0)) | 4826 | if ((strcmp("GET", Rd->Method) != 0) && (strcmp("HEAD", Rd->Method) != 0) && (strcmp("POST", Rd->Method) != 0)) |