diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-04-14 17:51:38 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-04-14 17:51:38 +0000 |
| commit | aff114c33d2b8879233fa513e6d760d0ef99b632 (patch) | |
| tree | 101230a8bd16a03319acc4b9b5fb33c33fb58672 /networking/httpd.c | |
| parent | 4c8b0dd97385b820e28bb8cb2d08ef3bd194a16a (diff) | |
| download | busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.tar.gz busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.tar.bz2 busybox-w32-aff114c33d2b8879233fa513e6d760d0ef99b632.zip | |
Larry Doolittle writes:
This is a bulk spelling fix patch against busybox-1.00-pre10.
If anyone gets a corrupted copy (and cares), let me know and
I will make alternate arrangements.
Erik - please apply.
Authors - please check that I didn't corrupt any meaning.
Package importers - see if any of these changes should be
passed to the upstream authors.
I glossed over lots of sloppy capitalizations, missing apostrophes,
mixed American/British spellings, and German-style compound words.
What is "pretect redefined for test" in cmdedit.c?
Good luck on the 1.00 release!
- Larry
Diffstat (limited to 'networking/httpd.c')
| -rw-r--r-- | networking/httpd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index aad30a1a1..7322d143a 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | * foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World" | 40 | * foo=`httpd -d $foo` # decode "Hello%20World" as "Hello World" |
| 41 | * bar=`httpd -e "<Hello World>"` # encode as "<Hello World>" | 41 | * bar=`httpd -e "<Hello World>"` # encode as "<Hello World>" |
| 42 | * Note that url encoding for arguments is not the same as html encoding for | 42 | * Note that url encoding for arguments is not the same as html encoding for |
| 43 | * presenation. -d decodes a url-encoded argument while -e encodes in html | 43 | * presentation. -d decodes a url-encoded argument while -e encodes in html |
| 44 | * for page display. | 44 | * for page display. |
| 45 | * | 45 | * |
| 46 | * httpd.conf has the following format: | 46 | * httpd.conf has the following format: |
| @@ -55,7 +55,7 @@ | |||
| 55 | * /adm:toor:PaSsWd # or user toor, pwd PaSsWd on urls starting with /adm/ | 55 | * /adm:toor:PaSsWd # or user toor, pwd PaSsWd on urls starting with /adm/ |
| 56 | * .au:audio/basic # additional mime type for audio.au files | 56 | * .au:audio/basic # additional mime type for audio.au files |
| 57 | * | 57 | * |
| 58 | * A/D may be as a/d or allow/deny - first char case unsensitive | 58 | * A/D may be as a/d or allow/deny - first char case insensitive |
| 59 | * Deny IP rules take precedence over allow rules. | 59 | * Deny IP rules take precedence over allow rules. |
| 60 | * | 60 | * |
| 61 | * | 61 | * |
| @@ -127,7 +127,7 @@ static const char home[] = "./"; | |||
| 127 | # define cont_l_fmt "%ld" | 127 | # define cont_l_fmt "%ld" |
| 128 | #endif | 128 | #endif |
| 129 | 129 | ||
| 130 | // Note: bussybox xfuncs are not used because we want the server to keep running | 130 | // Note: busybox xfuncs are not used because we want the server to keep running |
| 131 | // if something bad happens due to a malformed user request. | 131 | // if something bad happens due to a malformed user request. |
| 132 | // As a result, all memory allocation after daemonize | 132 | // As a result, all memory allocation after daemonize |
| 133 | // is checked rigorously | 133 | // is checked rigorously |
| @@ -260,7 +260,7 @@ static HttpdConfig *config; | |||
| 260 | static const char request_GET[] = "GET"; /* size algorithic optimize */ | 260 | static const char request_GET[] = "GET"; /* size algorithic optimize */ |
| 261 | 261 | ||
| 262 | static const char* const suffixTable [] = { | 262 | static const char* const suffixTable [] = { |
| 263 | /* Warning: shorted equalent suffix in one line must be first */ | 263 | /* Warning: shorted equivalent suffix in one line must be first */ |
| 264 | ".htm.html", "text/html", | 264 | ".htm.html", "text/html", |
| 265 | ".jpg.jpeg", "image/jpeg", | 265 | ".jpg.jpeg", "image/jpeg", |
| 266 | ".gif", "image/gif", | 266 | ".gif", "image/gif", |
| @@ -775,7 +775,7 @@ static char *decodeString(char *orig, int flag_plus_to_space) | |||
| 775 | * | 775 | * |
| 776 | > $Function: addEnv() | 776 | > $Function: addEnv() |
| 777 | * | 777 | * |
| 778 | * $Description: Add an enviornment variable setting to the global list. | 778 | * $Description: Add an environment variable setting to the global list. |
| 779 | * A NAME=VALUE string is allocated, filled, and added to the list of | 779 | * A NAME=VALUE string is allocated, filled, and added to the list of |
| 780 | * environment settings passed to the cgi execution script. | 780 | * environment settings passed to the cgi execution script. |
| 781 | * | 781 | * |
| @@ -1380,7 +1380,7 @@ static int checkPermIP(void) | |||
| 1380 | return cur->allow_deny == 'A'; /* Allow/Deny */ | 1380 | return cur->allow_deny == 'A'; /* Allow/Deny */ |
| 1381 | } | 1381 | } |
| 1382 | 1382 | ||
| 1383 | /* if uncofigured, return 1 - access from all */ | 1383 | /* if unconfigured, return 1 - access from all */ |
| 1384 | return !config->flg_deny_all; | 1384 | return !config->flg_deny_all; |
| 1385 | } | 1385 | } |
| 1386 | 1386 | ||
| @@ -1765,7 +1765,7 @@ static int miniHttpd(int server) | |||
| 1765 | while (1) { | 1765 | while (1) { |
| 1766 | readfd = portfd; | 1766 | readfd = portfd; |
| 1767 | 1767 | ||
| 1768 | /* Now wait INDEFINATELY on the set of sockets! */ | 1768 | /* Now wait INDEFINITELY on the set of sockets! */ |
| 1769 | if (select(server + 1, &readfd, 0, 0, 0) > 0) { | 1769 | if (select(server + 1, &readfd, 0, 0, 0) > 0) { |
| 1770 | if (FD_ISSET(server, &readfd)) { | 1770 | if (FD_ISSET(server, &readfd)) { |
| 1771 | int on; | 1771 | int on; |
| @@ -1990,7 +1990,7 @@ int httpd_main(int argc, char *argv[]) | |||
| 1990 | #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY | 1990 | #ifndef CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY |
| 1991 | server = openServer(); | 1991 | server = openServer(); |
| 1992 | # ifdef CONFIG_FEATURE_HTTPD_SETUID | 1992 | # ifdef CONFIG_FEATURE_HTTPD_SETUID |
| 1993 | /* drop privilegies */ | 1993 | /* drop privileges */ |
| 1994 | if(uid > 0) | 1994 | if(uid > 0) |
| 1995 | setuid(uid); | 1995 | setuid(uid); |
| 1996 | # endif | 1996 | # endif |