aboutsummaryrefslogtreecommitdiff
path: root/networking/httpd.c
diff options
context:
space:
mode:
Diffstat (limited to 'networking/httpd.c')
-rw-r--r--networking/httpd.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index ed15fd883..ef90770ac 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -125,6 +125,7 @@
125//usage: "\n -d STRING URL decode STRING" 125//usage: "\n -d STRING URL decode STRING"
126 126
127#include "libbb.h" 127#include "libbb.h"
128#include "common_bufsiz.h"
128#if ENABLE_PAM 129#if ENABLE_PAM
129/* PAM may include <locale.h>. We may need to undefine bbox's stub define: */ 130/* PAM may include <locale.h>. We may need to undefine bbox's stub define: */
130# undef setlocale 131# undef setlocale
@@ -307,7 +308,8 @@ struct globals {
307 Htaccess *script_i; /* config script interpreters */ 308 Htaccess *script_i; /* config script interpreters */
308#endif 309#endif
309 char *iobuf; /* [IOBUF_SIZE] */ 310 char *iobuf; /* [IOBUF_SIZE] */
310#define hdr_buf bb_common_bufsiz1 311#define hdr_buf bb_common_bufsiz1
312#define sizeof_hdr_buf COMMON_BUFSIZE
311 char *hdr_ptr; 313 char *hdr_ptr;
312 int hdr_cnt; 314 int hdr_cnt;
313#if ENABLE_FEATURE_HTTPD_ERROR_PAGES 315#if ENABLE_FEATURE_HTTPD_ERROR_PAGES
@@ -1066,7 +1068,7 @@ static int get_line(void)
1066 alarm(HEADER_READ_TIMEOUT); 1068 alarm(HEADER_READ_TIMEOUT);
1067 while (1) { 1069 while (1) {
1068 if (hdr_cnt <= 0) { 1070 if (hdr_cnt <= 0) {
1069 hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof(hdr_buf)); 1071 hdr_cnt = safe_read(STDIN_FILENO, hdr_buf, sizeof_hdr_buf);
1070 if (hdr_cnt <= 0) 1072 if (hdr_cnt <= 0)
1071 break; 1073 break;
1072 hdr_ptr = hdr_buf; 1074 hdr_ptr = hdr_buf;
@@ -1191,9 +1193,9 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post
1191 /* We expect data, prev data portion is eaten by CGI 1193 /* We expect data, prev data portion is eaten by CGI
1192 * and there *is* data to read from the peer 1194 * and there *is* data to read from the peer
1193 * (POSTDATA) */ 1195 * (POSTDATA) */
1194 //count = post_len > (int)sizeof(hdr_buf) ? (int)sizeof(hdr_buf) : post_len; 1196 //count = post_len > (int)sizeof_hdr_buf ? (int)sizeof_hdr_buf : post_len;
1195 //count = safe_read(STDIN_FILENO, hdr_buf, count); 1197 //count = safe_read(STDIN_FILENO, hdr_buf, count);
1196 count = safe_read(STDIN_FILENO, hdr_buf, sizeof(hdr_buf)); 1198 count = safe_read(STDIN_FILENO, hdr_buf, sizeof_hdr_buf);
1197 if (count > 0) { 1199 if (count > 0) {
1198 hdr_cnt = count; 1200 hdr_cnt = count;
1199 hdr_ptr = hdr_buf; 1201 hdr_ptr = hdr_buf;