diff options
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/httpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index ce557c1bf..176eb244b 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
| @@ -484,7 +484,6 @@ static const struct { | |||
| 484 | }; | 484 | }; |
| 485 | 485 | ||
| 486 | struct globals { | 486 | struct globals { |
| 487 | int verbose; /* must be int (used by getopt32) */ | ||
| 488 | smallint flg_deny_all; | 487 | smallint flg_deny_all; |
| 489 | #if ENABLE_FEATURE_HTTPD_GZIP | 488 | #if ENABLE_FEATURE_HTTPD_GZIP |
| 490 | /* client can handle gzip / we are going to send gzip */ | 489 | /* client can handle gzip / we are going to send gzip */ |
| @@ -494,6 +493,7 @@ struct globals { | |||
| 494 | #if ENABLE_FEATURE_HTTPD_CGI | 493 | #if ENABLE_FEATURE_HTTPD_CGI |
| 495 | smallint cgi_output; | 494 | smallint cgi_output; |
| 496 | #endif | 495 | #endif |
| 496 | int verbose; /* must be int (used by getopt32) */ | ||
| 497 | time_t last_mod; | 497 | time_t last_mod; |
| 498 | #if ENABLE_FEATURE_HTTPD_ETAG | 498 | #if ENABLE_FEATURE_HTTPD_ETAG |
| 499 | char *if_none_match; | 499 | char *if_none_match; |
| @@ -555,7 +555,7 @@ struct globals { | |||
| 555 | #endif | 555 | #endif |
| 556 | char iobuf[IOBUF_SIZE] ALIGN8; | 556 | char iobuf[IOBUF_SIZE] ALIGN8; |
| 557 | }; | 557 | }; |
| 558 | #define G (*ptr_to_globals) | 558 | #define G (*OFFSET_PTR_TO_GLOBALS) |
| 559 | #define verbose (G.verbose ) | 559 | #define verbose (G.verbose ) |
| 560 | #define flg_deny_all (G.flg_deny_all ) | 560 | #define flg_deny_all (G.flg_deny_all ) |
| 561 | #if ENABLE_FEATURE_HTTPD_GZIP | 561 | #if ENABLE_FEATURE_HTTPD_GZIP |
| @@ -598,7 +598,7 @@ enum { | |||
| 598 | #define iobuf (G.iobuf ) | 598 | #define iobuf (G.iobuf ) |
| 599 | #define INIT_G() do { \ | 599 | #define INIT_G() do { \ |
| 600 | setup_common_bufsiz(); \ | 600 | setup_common_bufsiz(); \ |
| 601 | SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ | 601 | SET_OFFSET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ |
| 602 | IF_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \ | 602 | IF_FEATURE_HTTPD_BASIC_AUTH(g_realm = "Web Server Authentication";) \ |
| 603 | IF_FEATURE_HTTPD_RANGES(range_start = -1;) \ | 603 | IF_FEATURE_HTTPD_RANGES(range_start = -1;) \ |
| 604 | bind_addr_or_port = STR(CONFIG_FEATURE_HTTPD_PORT_DEFAULT); \ | 604 | bind_addr_or_port = STR(CONFIG_FEATURE_HTTPD_PORT_DEFAULT); \ |
