cvs commit: apache/src CHANGES mod_cgi.c mod_include.c util_script.c
dgaudet 97/06/26 19:28:59
Modified:src Tag: APACHE_1_2_X CHANGES mod_cgi.c mod_include.c
util_script.c
Log:
give me useless text not useless errno
Reviewed by: Dean, Alexei
Submitted by: Marc
Revision ChangesPath
No revision
No revision
1.286.2.13 +2 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.12
retrieving revision 1.286.2.13
diff -C3 -r1.286.2.12 -r1.286.2.13
*** CHANGES 1997/06/27 02:26:29 1.286.2.12
--- CHANGES 1997/06/27 02:28:53 1.286.2.13
***
*** 1,4
--- 1,6
Changes with Apache 1.2.1
+
+ *) Improved unix error response logging. [Marc Slemko]
*) Update mod_rewrite from 3.0.5 to 3.0.6. New ruleflag
QSA=query_string_append. Also fixed a nasty bug in per-dir context:
1.39.2.1 +2 -1 apache/src/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.39
retrieving revision 1.39.2.1
diff -C3 -r1.39 -r1.39.2.1
*** mod_cgi.c 1997/04/21 20:29:09 1.39
--- mod_cgi.c 1997/06/27 02:28:54 1.39.2.1
***
*** 333,339
*/
ap_snprintf(err_string, sizeof(err_string),
! exec of %s failed, errno is %d\n, r-filename, errno);
write(2, err_string, strlen(err_string));
exit(0);
}
--- 333,340
*/
ap_snprintf(err_string, sizeof(err_string),
! exec of %s failed, reason: %s (errno = %d)\n,
! r-filename, strerror(errno), errno);
write(2, err_string, strlen(err_string));
exit(0);
}
1.33.2.1 +2 -2 apache/src/mod_include.c
Index: mod_include.c
===
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -C3 -r1.33 -r1.33.2.1
*** mod_include.c 1997/06/05 00:57:45 1.33
--- mod_include.c 1997/06/27 02:28:55 1.33.2.1
***
*** 646,653
fprintf (dbg, Exec failed\n);
#endif
ap_snprintf(err_string, sizeof(err_string),
! httpd: exec of %s failed, errno is %d\n,
! SHELL_PATH,errno);
write (2, err_string, strlen(err_string));
exit(0);
}
--- 646,653
fprintf (dbg, Exec failed\n);
#endif
ap_snprintf(err_string, sizeof(err_string),
! httpd: exec of %s failed, reason: %s (errno = %d)\n,
! SHELL_PATH, strerror(errno), errno);
write (2, err_string, strlen(err_string));
exit(0);
}
1.58.2.1 +4 -1 apache/src/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apache/src/util_script.c,v
retrieving revision 1.58
retrieving revision 1.58.2.1
diff -C3 -r1.58 -r1.58.2.1
*** util_script.c 1997/05/11 23:13:22 1.58
--- util_script.c 1997/06/27 02:28:56 1.58.2.1
***
*** 502,508
program = fopen (r-filename, r);
if (!program) {
char err_string[HUGE_STRING_LEN];
! ap_snprintf(err_string, sizeof(err_string), open of %s failed,
errno is %d\n, r-filename, errno);
/* write(2, err_string, strlen(err_string)); */
/* exit(0); */
log_unixerr(fopen, NULL, err_string, r-server);
--- 502,511
program = fopen (r-filename, r);
if (!program) {
char err_string[HUGE_STRING_LEN];
! ap_snprintf(err_string, sizeof(err_string),
! open of %s failed, reason: fopen: %s (errno = %d)\n,
! r-filename, strerror(errno), errno);
!
/* write(2, err_string, strlen(err_string)); */
/* exit(0); */
log_unixerr(fopen, NULL, err_string, r-server);
cvs commit: apache/src CHANGES mod_cgi.c
fielding97/03/31 22:17:53
Modified:src CHANGES mod_cgi.c
Log:
Stopgap solution for CGI 3-second delay with server-side includes: if
processing a subrequest, allocate memory from r-main-pool instead
of r-pool so that we can avoid waiting for free_proc_chain to cleanup
in the middle of an SSI request.
Submitted by: Dean Gaudet, PR #122
Reviewed by: Roy Fielding
Revision ChangesPath
1.219 +5 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.218
retrieving revision 1.219
diff -C3 -r1.218 -r1.219
*** CHANGES 1997/04/01 05:41:43 1.218
--- CHANGES 1997/04/01 06:17:51 1.219
***
*** 1,5
--- 1,10
Changes with Apache 1.2b8
+ *) Stopgap solution for CGI 3-second delay with server-side includes: if
+ processing a subrequest, allocate memory from r-main-pool instead
+ of r-pool so that we can avoid waiting for free_proc_chain to cleanup
+ in the middle of an SSI request. [Dean Gaudet] PR #122
+
*) Fixed status of response when POST is received for a nonexistant URL
(was sending 405, now 404) and when any method is sent with a
full-URI that doesn't match the server and the server is not acting
1.36 +14 -8 apache/src/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C3 -r1.35 -r1.36
*** mod_cgi.c 1997/03/07 14:15:39 1.35
--- mod_cgi.c 1997/04/01 06:17:52 1.36
***
*** 155,161
{ NULL}
};
! int log_scripterror(request_rec *r, cgi_server_conf *conf, int ret,
char *error)
{
FILE *f;
--- 155,161
{ NULL}
};
! static int log_scripterror(request_rec *r, cgi_server_conf *conf, int ret,
char *error)
{
FILE *f;
***
*** 182,188
return ret;
}
! int log_script(request_rec *r, cgi_server_conf *conf, int ret,
char *dbuf, char *sbuf, FILE *script_in, FILE *script_err)
{
table *hdrs_arr = r-headers_in;
--- 182,188
return ret;
}
! static int log_script(request_rec *r, cgi_server_conf *conf, int ret,
char *dbuf, char *sbuf, FILE *script_in, FILE *script_err)
{
table *hdrs_arr = r-headers_in;
***
*** 252,259
fputs(\n, f);
}
! pfclose(r-pool, script_in);
! pfclose(r-pool, script_err);
pfclose(r-pool, f);
return ret;
--- 252,259
fputs(\n, f);
}
! pfclose(r-main ? r-main-pool : r-pool, script_in);
! pfclose(r-main ? r-main-pool : r-pool, script_err);
pfclose(r-pool, f);
return ret;
***
*** 406,412
cld.debug = conf-logname ? 1 : 0;
if (!(child_pid =
! spawn_child_err (r-pool, cgi_child, (void *)cld,
nph ? just_wait : kill_after_timeout,
#ifdef __EMX__
script_out, script_in, script_err))) {
--- 406,418
cld.debug = conf-logname ? 1 : 0;
if (!(child_pid =
! /*
!* we spawn out of r-main if it's there so that we can avoid
!* waiting for free_proc_chain to cleanup in the middle of an
!* SSI request -djg
!*/
! spawn_child_err (r-main ? r-main-pool : r-pool, cgi_child,
! (void *)cld,
nph ? just_wait : kill_after_timeout,
#ifdef __EMX__
script_out, script_in, script_err))) {
***
*** 467,473
kill_timeout (r);
}
! pfclose (r-pool, script_out);
/* Handle script return... */
if (script_in !nph) {
--- 473,479
kill_timeout (r);
}
! pfclose (r-main ? r-main-pool : r-pool, script_out);
/* Handle script return... */
if (script_in !nph) {
***
*** 519,526
while (fgets(argsbuffer, HUGE_STRING_LEN-1, script_err) != NULL)
continue;
kill_timeout (r);
! pfclose (r-pool, script_in);
! pfclose (r-pool, script_err);
}
if (nph) {
--- 525,532
while (fgets(argsbuffer, HUGE_STRING_LEN-1, script_err) != NULL)
continue;
kill_timeout (r);
! pfclose (r-main ? r-main-pool : r-pool, script_in);
! pfclose (r-main ? r-main-pool : r-pool, script_err);
}
if (nph) {
cvs commit: apache/src CHANGES mod_cgi.c
randy 97/01/24 16:59:45
Modified:src CHANGES mod_cgi.c
Log:
Turn off call to can_exec() if suexec_enabled.
Revision ChangesPath
1.130 +4 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.129
retrieving revision 1.130
diff -C3 -r1.129 -r1.130
*** CHANGES 1997/01/24 23:33:40 1.129
--- CHANGES 1997/01/25 00:59:42 1.130
***
*** 1,5
--- 1,9
Changes with Apache 1.2b5
+ *) Don't call can_exec() if suexec_enabled. Calling this requires
+ scripts executed by the suexec wrapper to be world executable, which
+ defeats one of the advantages of running the wrapper. [Randy Terbush]
+
*) Portability Fix: IRIX complained with 'make clean' about *pure*
(removed)
[Jim Jagielski]
1.30 +6 -4 apache/src/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C3 -r1.29 -r1.30
*** mod_cgi.c 1997/01/24 07:45:17 1.29
--- mod_cgi.c 1997/01/25 00:59:42 1.30
***
*** 377,386
if (r-finfo.st_mode == 0)
return log_scripterror(r, conf, NOT_FOUND,
script not found or unable to stat);
! if(!can_exec(r-finfo))
! return log_scripterror(r, conf, FORBIDDEN,
!file permissions deny server execution);
!
if ((retval = setup_client_block(r, REQUEST_CHUNKED_ERROR)))
return retval;
--- 377,388
if (r-finfo.st_mode == 0)
return log_scripterror(r, conf, NOT_FOUND,
script not found or unable to stat);
! if (!suexec_enabled) {
! if (!can_exec(r-finfo))
! return log_scripterror(r, conf, FORBIDDEN,
!file permissions deny server
execution);
! }
!
if ((retval = setup_client_block(r, REQUEST_CHUNKED_ERROR)))
return retval;
cvs commit: apache/src CHANGES mod_cgi.c
randy 96/12/24 12:03:25
Modified:src CHANGES mod_cgi.c
Log:
Fix invalid reference to the correct resource pool. This could cause
resources not to be properly freed, or freeing of invalid resources.
Reviewed by: Chuck Murcko, Randy Terbush
Submitted by: Dean Gaudet
Revision ChangesPath
1.101 +3 -0 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.100
retrieving revision 1.101
diff -C3 -r1.100 -r1.101
*** CHANGES 1996/12/24 19:53:04 1.100
--- CHANGES 1996/12/24 20:03:22 1.101
***
*** 1,5
--- 1,8
Changes with Apache 1.2b3:
+ *) Fix error in mod_cgi which could cause resources not to be properly
+ freed, or worse. [Dean Gaudet]
+
*) Fix find_string() NULL pointer dereference. [Howard Fear]
*) Add set_flag_slot() at the request of Dirk and others.
1.26 +4 -4 apache/src/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C3 -r1.25 -r1.26
*** mod_cgi.c 1996/12/17 22:13:06 1.25
--- mod_cgi.c 1996/12/24 20:03:23 1.26
***
*** 389,395
cld.debug = conf-logname ? 1 : 0;
if (!(child_pid =
! spawn_child_err (r-connection-pool, cgi_child, (void *)cld,
nph ? just_wait : kill_after_timeout,
#ifdef __EMX__
script_out, script_in, script_err))) {
--- 389,395
cld.debug = conf-logname ? 1 : 0;
if (!(child_pid =
! spawn_child_err (r-pool, cgi_child, (void *)cld,
nph ? just_wait : kill_after_timeout,
#ifdef __EMX__
script_out, script_in, script_err))) {
***
*** 450,456
kill_timeout (r);
}
! pfclose (r-connection-pool, script_out);
/* Handle script return... */
if (script_in !nph) {
--- 450,456
kill_timeout (r);
}
! pfclose (r-pool, script_out);
/* Handle script return... */
if (script_in !nph) {
***
*** 496,503
while (fgets(argsbuffer, HUGE_STRING_LEN-1, script_err) != NULL)
continue;
kill_timeout (r);
! pfclose (r-connection-pool, script_in);
! pfclose (r-connection-pool, script_err);
}
if (nph) {
--- 496,503
while (fgets(argsbuffer, HUGE_STRING_LEN-1, script_err) != NULL)
continue;
kill_timeout (r);
! pfclose (r-pool, script_in);
! pfclose (r-pool, script_err);
}
if (nph) {
cvs commit: apache/src CHANGES mod_cgi.c
randy 96/12/17 12:42:40
Modified:src CHANGES mod_cgi.c
Log:
Reset timeout while reading via get_client_block() in mod_cgi.c
Fixes failed file transfer problems for _large_ files.
Reviewed by: Randy Terbush
Submitted by: Rasmus Lerdorf
Revision ChangesPath
1.89 +5 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.88
retrieving revision 1.89
diff -C3 -r1.88 -r1.89
*** CHANGES 1996/12/17 20:30:46 1.88
--- CHANGES 1996/12/17 20:42:37 1.89
***
*** 1,10
Changes with Apache 1.2b3:
*) Add the ability to pass different Makefile.tmpl files to Configure
! using the -make flag.
*) Fix coredump triggered when sending a SIGHUP to the server caused
by a dereference of an unitialized pointer in the listen_rec.
*) Add FILEPATH_INFO variable to CGI environment, which is equal to
PATH_INFO from previous versions of Apache (in certain situations,
--- 1,14
Changes with Apache 1.2b3:
+ *) Reset timeout while reading via get_client_block() in mod_cgi.c
+ Fixes problem with timed out transfers of large files. [Rasmus Lerdorf]
+
*) Add the ability to pass different Makefile.tmpl files to Configure
! using the -make flag. [Rob Hartill]
*) Fix coredump triggered when sending a SIGHUP to the server caused
by a dereference of an unitialized pointer in the listen_rec.
+ [Ben Laurie]
*) Add FILEPATH_INFO variable to CGI environment, which is equal to
PATH_INFO from previous versions of Apache (in certain situations,
1.24 +2 -1 apache/src/mod_cgi.c
Index: mod_cgi.c
===
RCS file: /export/home/cvs/apache/src/mod_cgi.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C3 -r1.23 -r1.24
*** mod_cgi.c 1996/12/01 20:28:55 1.23
--- mod_cgi.c 1996/12/17 20:42:38 1.24
***
*** 429,435
if ((dbpos + len_read) conf-bufbytes)
dbsize = conf-bufbytes - dbpos;
else dbsize = len_read;
! strncpy(dbuf + dbpos, argsbuffer, dbsize);
dbpos += dbsize;
}
if (fwrite(argsbuffer, 1, len_read, script_out) (size_t)len_read)
{
--- 429,436
if ((dbpos + len_read) conf-bufbytes)
dbsize = conf-bufbytes - dbpos;
else dbsize = len_read;
! reset_timeout(r);
! memcpy(dbuf + dbpos, argsbuffer, dbsize);
dbpos += dbsize;
}
if (fwrite(argsbuffer, 1, len_read, script_out) (size_t)len_read)
{
