diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-03-15 08:29:22 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-03-15 08:29:22 +0000 |
| commit | c7bda1ce659294d6e22c06e087f6f265983c7578 (patch) | |
| tree | 4c6d2217f4d8306c59cf1096f8664e1cfd167213 /networking/httpd.c | |
| parent | 8854004b41065b3d081af7f3df13a100b0c8bfbe (diff) | |
| download | busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.gz busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.tar.bz2 busybox-w32-c7bda1ce659294d6e22c06e087f6f265983c7578.zip | |
Remove trailing whitespace. Update copyright to include 2004.
Diffstat (limited to 'networking/httpd.c')
| -rw-r--r-- | networking/httpd.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index f2fd2b38d..aad30a1a1 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | * for page display. | 44 | * for page display. |
| 45 | * | 45 | * |
| 46 | * httpd.conf has the following format: | 46 | * httpd.conf has the following format: |
| 47 | * | 47 | * |
| 48 | * A:172.20. # Allow address from 172.20.0.0/16 | 48 | * A:172.20. # Allow address from 172.20.0.0/16 |
| 49 | * A:10.0.0.0/25 # Allow any address from 10.0.0.0-10.0.0.127 | 49 | * A:10.0.0.0/25 # Allow any address from 10.0.0.0-10.0.0.127 |
| 50 | * A:10.0.0.0/255.255.255.128 # Allow any address that previous set | 50 | * A:10.0.0.0/255.255.255.128 # Allow any address that previous set |
| @@ -54,13 +54,13 @@ | |||
| 54 | * /adm:admin:setup # Require user admin, pwd setup on urls starting with /adm/ | 54 | * /adm:admin:setup # Require user admin, pwd setup on urls starting with /adm/ |
| 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 unsensitive |
| 59 | * Deny IP rules take precedence over allow rules. | 59 | * Deny IP rules take precedence over allow rules. |
| 60 | * | 60 | * |
| 61 | * | 61 | * |
| 62 | * The Deny/Allow IP logic: | 62 | * The Deny/Allow IP logic: |
| 63 | * | 63 | * |
| 64 | * - Default is to allow all. No addresses are denied unless | 64 | * - Default is to allow all. No addresses are denied unless |
| 65 | * denied with a D: rule. | 65 | * denied with a D: rule. |
| 66 | * - Order of Deny/Allow rules is significant | 66 | * - Order of Deny/Allow rules is significant |
| @@ -68,19 +68,19 @@ | |||
| 68 | * - If a deny all rule (D:*) is used it acts as a catch-all for unmatched | 68 | * - If a deny all rule (D:*) is used it acts as a catch-all for unmatched |
| 69 | * addresses. | 69 | * addresses. |
| 70 | * - Specification of Allow all (A:*) is a no-op | 70 | * - Specification of Allow all (A:*) is a no-op |
| 71 | * | 71 | * |
| 72 | * Example: | 72 | * Example: |
| 73 | * 1. Allow only specified addresses | 73 | * 1. Allow only specified addresses |
| 74 | * A:172.20 # Allow any address that begins with 172.20. | 74 | * A:172.20 # Allow any address that begins with 172.20. |
| 75 | * A:10.10. # Allow any address that begins with 10.10. | 75 | * A:10.10. # Allow any address that begins with 10.10. |
| 76 | * A:127.0.0.1 # Allow local loopback connections | 76 | * A:127.0.0.1 # Allow local loopback connections |
| 77 | * D:* # Deny from other IP connections | 77 | * D:* # Deny from other IP connections |
| 78 | * | 78 | * |
| 79 | * 2. Only deny specified addresses | 79 | * 2. Only deny specified addresses |
| 80 | * D:1.2.3. # deny from 1.2.3.0 - 1.2.3.255 | 80 | * D:1.2.3. # deny from 1.2.3.0 - 1.2.3.255 |
| 81 | * D:2.3.4. # deny from 2.3.4.0 - 2.3.4.255 | 81 | * D:2.3.4. # deny from 2.3.4.0 - 2.3.4.255 |
| 82 | * A:* # (optional line added for clarity) | 82 | * A:* # (optional line added for clarity) |
| 83 | * | 83 | * |
| 84 | * If a sub directory contains a config file it is parsed and merged with | 84 | * If a sub directory contains a config file it is parsed and merged with |
| 85 | * any existing settings as if it was appended to the original configuration. | 85 | * any existing settings as if it was appended to the original configuration. |
| 86 | * | 86 | * |
| @@ -91,11 +91,11 @@ | |||
| 91 | * subdir http request, any merge is discarded when the process exits. As a | 91 | * subdir http request, any merge is discarded when the process exits. As a |
| 92 | * result, the subdir settings only have a lifetime of a single request. | 92 | * result, the subdir settings only have a lifetime of a single request. |
| 93 | * | 93 | * |
| 94 | * | 94 | * |
| 95 | * If -c is not set, an attempt will be made to open the default | 95 | * If -c is not set, an attempt will be made to open the default |
| 96 | * root configuration file. If -c is set and the file is not found, the | 96 | * root configuration file. If -c is set and the file is not found, the |
| 97 | * server exits with an error. | 97 | * server exits with an error. |
| 98 | * | 98 | * |
| 99 | */ | 99 | */ |
| 100 | 100 | ||
| 101 | 101 | ||
| @@ -447,7 +447,7 @@ static void free_config_lines(Htaccess **pprev) | |||
| 447 | > $Function: parse_conf() | 447 | > $Function: parse_conf() |
| 448 | * | 448 | * |
| 449 | * $Description: parse configuration file into in-memory linked list. | 449 | * $Description: parse configuration file into in-memory linked list. |
| 450 | * | 450 | * |
| 451 | * The first non-white character is examined to determine if the config line | 451 | * The first non-white character is examined to determine if the config line |
| 452 | * is one of the following: | 452 | * is one of the following: |
| 453 | * .ext:mime/type # new mime type not compiled into httpd | 453 | * .ext:mime/type # new mime type not compiled into httpd |
| @@ -464,7 +464,7 @@ static void free_config_lines(Htaccess **pprev) | |||
| 464 | * checks. | 464 | * checks. |
| 465 | * (int) flag . . . . . . the source of the parse request. | 465 | * (int) flag . . . . . . the source of the parse request. |
| 466 | * | 466 | * |
| 467 | * $Return: (None) | 467 | * $Return: (None) |
| 468 | * | 468 | * |
| 469 | ****************************************************************************/ | 469 | ****************************************************************************/ |
| 470 | static void parse_conf(const char *path, int flag) | 470 | static void parse_conf(const char *path, int flag) |
| @@ -1726,7 +1726,7 @@ FORBIDDEN: /* protect listing /cgi-bin */ | |||
| 1726 | /* Properly wait for remote to closed */ | 1726 | /* Properly wait for remote to closed */ |
| 1727 | FD_ZERO (&s_fd) ; | 1727 | FD_ZERO (&s_fd) ; |
| 1728 | FD_SET (a_c_w, &s_fd) ; | 1728 | FD_SET (a_c_w, &s_fd) ; |
| 1729 | 1729 | ||
| 1730 | do { | 1730 | do { |
| 1731 | tv.tv_sec = 2 ; | 1731 | tv.tv_sec = 2 ; |
| 1732 | tv.tv_usec = 0 ; | 1732 | tv.tv_usec = 0 ; |