You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jw...@apache.org on 2001/11/12 05:34:13 UTC
cvs commit: httpd-2.0/modules/generators mod_cgi.c
jwoolley 01/11/11 20:34:13
Modified: modules/generators mod_cgi.c
Log:
Port Justin's mod_cgid change to mod_cgi.
mod_cgi wasn't actually broken in the way that mod_cgid was, but
it's still good do have these checks be against APR_SUCCESS rather
than 0 for clarity.
Revision Changes Path
1.109 +12 -7 httpd-2.0/modules/generators/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -u -r1.108 -r1.109
--- mod_cgi.c 2001/11/12 03:23:12 1.108
+++ mod_cgi.c 2001/11/12 04:34:13 1.109
@@ -243,7 +243,8 @@
char argsbuffer[HUGE_STRING_LEN];
char *newline;
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_err) == 0) {
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_err) == APR_SUCCESS) {
newline = strchr(argsbuffer, '\n');
if (newline) {
*newline = '\0';
@@ -273,7 +274,8 @@
(apr_file_open(&f, conf->logname,
APR_APPEND|APR_WRITE|APR_CREATE, APR_OS_DEFAULT, r->pool) != APR_SUCCESS)) {
/* Soak up script output */
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == 0)
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_in) == APR_SUCCESS)
continue;
log_script_err(r, script_err);
@@ -311,18 +313,20 @@
if (sbuf && *sbuf)
apr_file_printf(f, "%s\n", sbuf);
- if (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == 0) {
+ if (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == APR_SUCCESS) {
apr_file_puts("%stdout\n", f);
apr_file_puts(argsbuffer, f);
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == 0)
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_in) == APR_SUCCESS)
apr_file_puts(argsbuffer, f);
apr_file_puts("\n", f);
}
- if (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_err) == 0) {
+ if (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_err) == APR_SUCCESS) {
apr_file_puts("%stderr\n", f);
apr_file_puts(argsbuffer, f);
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_err) == 0)
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_err) == APR_SUCCESS)
apr_file_puts(argsbuffer, f);
apr_file_puts("\n", f);
}
@@ -676,7 +680,8 @@
if (location && location[0] == '/' && r->status == 200) {
/* Soak up all the script output */
- while (apr_file_gets(argsbuffer, HUGE_STRING_LEN, script_in) == 0) {
+ while (apr_file_gets(argsbuffer, HUGE_STRING_LEN,
+ script_in) == APR_SUCCESS) {
continue;
}
log_script_err(r, script_err);