cvs commit: apache-2.0/src/modules/mpm/winnt winnt.c
stoddard99/10/01 10:18:31
Modified:src/modules/mpm/winnt winnt.c
Log:
Exit the child process if too many select errors
Revision ChangesPath
1.13 +2 -0 apache-2.0/src/modules/mpm/winnt/winnt.c
Index: winnt.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- winnt.c 1999/08/31 05:33:27 1.12
+++ winnt.c 1999/10/01 17:18:28 1.13
@@ -561,6 +561,7 @@
ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_WIN32ERROR,
server_conf, "select failed with errno %d", h_errno);
count_select_errors++;
if (count_select_errors > MAX_SELECT_ERRORS) {
+workers_may_exit = 1;
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR,
server_conf,
"Too many errors in select loop. Child process
exiting.");
break;
@@ -662,6 +663,7 @@
ap_log_error(APLOG_MARK, APLOG_INFO|APLOG_WIN32ERROR,
server_conf, "select failed with errno %d", h_errno);
count_select_errors++;
if (count_select_errors > MAX_SELECT_ERRORS) {
+workers_may_exit = 1;
ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_WIN32ERROR,
server_conf,
"Too many errors in select loop. Child process
exiting.");
break;
cvs commit: apache-2.0/src Configure
rse 99/10/01 09:22:49 Modified:src Configure Log: Really also pass the remaining options to APR's configure. Unfortunately for still unknown reasons Autoconf horribly dislikes an existing -DTARGET=\"..\", so make an ugly kludge. If you can find out how one can fix this, feel free to do it. I've investigated now over an hour and couldn't find a better solution than just removing this option. Revision ChangesPath 1.8 +2 -1 apache-2.0/src/Configure Index: Configure === RCS file: /home/cvs/apache-2.0/src/Configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Configure 1999/10/01 11:44:13 1.7 +++ Configure 1999/10/01 16:22:48 1.8 @@ -1731,7 +1731,8 @@ fi echo " + configuring Apache Portable Runtime (APR)" cd lib/apr -CC="$CC" CFLAGS="$TEXTRA_CFLAGS" OPTIM="$TOPTIM" ./configure >/dev/null +stripped_CFLAGS=`echo "$CFLAGS " | sed -e 's/-DTARGET[^ ]*//'` # FIXME +CC="$CC" CFLAGS="$TEXTRA_CFLAGS $stripped_CFLAGS" OPTIM="$TOPTIM $OPTIM" ./configure >/dev/null if [ $? -ne 0 ]; then echo "** FAILED to configure APR" exit 1
cvs commit: apache-2.0/src/lib/apr/time/unix access.c
rse 99/10/01 09:18:41
Modified:src/lib/apr/file_io/unix dir.c fileacc.c
src/lib/apr/include apr_general.h
src/lib/apr/lib apr_cpystrn.c apr_md5.c apr_pools.c
apr_slack.c
src/lib/apr/locks/unix crossproc.c
src/lib/apr/network_io/unix networkio.h poll.c sockets.c
sockopt.c
src/lib/apr/threadproc/unix proc.c signals.c
src/lib/apr/time/unix access.c
Log:
Ok, today it bored me too much that APR shouts many pages with warnings under
--with-option=devel (which has maximum -W's enabled which are still practical
for Apache), so I investiged an hour and did a quick cleanup of the APR
sources.
Please guys, if you're using gcc, please _always_ at least use -Wall for
compiling Apache. You will be surprised how much mistakes it catches easily. I
don't want to say you have to use the maximum -W approach I personally prefer,
but Apache's sources should always at least pass -Wall silently, I think.
Thanks.
Revision ChangesPath
1.3 +5 -5 apache-2.0/src/lib/apr/file_io/unix/dir.c
Index: dir.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dir.c 1999/09/03 12:22:27 1.2
+++ dir.c 1999/10/01 16:18:28 1.3
@@ -63,7 +63,7 @@
#include "apr_lib.h"
#include "apr_portable.h"
-ap_status_t dir_cleanup(void *thedir)
+static ap_status_t dir_cleanup(void *thedir)
{
struct dir_t *dir = thedir;
if (closedir(dir->dirstruct) == 0) {
@@ -208,24 +208,24 @@
* arg 1) the currently open directory.
* arg 2) the last modified time of the directory entry.
*/
-ap_status_t ap_dir_entry_mtime(struct dir_t *thedir, time_t *time)
+ap_status_t ap_dir_entry_mtime(struct dir_t *thedir, time_t *mtime)
{
struct stat filestat;
char *fname = NULL;
if (thedir->entry == NULL) {
-*time = -1;
+*mtime = -1;
return APR_ENOFILE;
}
fname = ap_pstrcat(thedir->cntxt, thedir->dirname, "/",
thedir->entry->d_name, NULL);
if (stat(fname, &filestat) == -1) {
-*time = -1;
+*mtime = -1;
return APR_ENOSTAT;
}
-*time = filestat.st_mtime;
+*mtime = filestat.st_mtime;
return APR_SUCCESS;
}
1.5 +9 -9 apache-2.0/src/lib/apr/file_io/unix/fileacc.c
Index: fileacc.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fileacc.c 1999/09/20 21:34:20 1.4
+++ fileacc.c 1999/10/01 16:18:28 1.5
@@ -157,17 +157,17 @@
* arg 1) The currently open file.
* arg 2) The last access time of the file.
*/
-ap_status_t ap_get_fileatime(struct file_t *file, time_t *time)
+ap_status_t ap_get_fileatime(struct file_t *file, time_t *atime)
{
if (file != NULL) {
if (!file->stated) {
ap_getfileinfo(file);
}
-*time = file->atime;
+*atime = file->atime;
return APR_SUCCESS;
}
else {
-*time = -1;
+*atime = -1;
return APR_ENOFILE;
}
}
@@ -178,17 +178,17 @@
* arg 1) The currently open file.
* arg 2) The last change time of the file.
*/
-ap_status_t ap_get_filectime(struct file_t *file, time_t *time)
+ap_status_t ap_get_filectime(struct file_t *file, time_t *ptime)
{
if (file != NULL) {
if (!file->stated) {
ap_getfileinfo(file);
}
-*time = file->ctime;
+*ptime = file->ctime;
return APR_SUCCESS;
}
else {
-*time = -1;
+*ptime = -1;
return APR_ENOFILE;
}
}
@@ -199,17 +199,17 @@
* arg 1) The currently open file.
* arg 2) The last modified time of the file.
*/
-ap_status_t ap_get_filemtime(struct file_t *file, time_t *time)
+ap_status_t ap_get_filemtime(struct file_t *file, time_t *mtime)
{
if (file != NULL) {
if (!file->stated) {
ap_getfileinfo(file);
}
-*time = file->mtime;
+*mtime = file->mtime;
return APR_SUCCESS;
}
else {
-*time = -1;
+*mtime = -1;
return APR_ENOFILE;
}
}
1.4 +5 -1 apache-2.0/src/lib/apr/include/apr_general.h
Index: apr_general.h
===
RCS file: /hom
cvs commit: apache-2.0/src Configure
rse 99/10/01 04:44:13 Modified:src Configure Log: Fix and extend APR configuration call. Revision ChangesPath 1.7 +1 -1 apache-2.0/src/Configure Index: Configure === RCS file: /home/cvs/apache-2.0/src/Configure,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Configure 1999/09/27 07:49:00 1.6 +++ Configure 1999/10/01 11:44:13 1.7 @@ -1731,7 +1731,7 @@ fi echo " + configuring Apache Portable Runtime (APR)" cd lib/apr -CC="$CC" CFLAGS="$EXTRA_CFLAGS" ./configure >/dev/null +CC="$CC" CFLAGS="$TEXTRA_CFLAGS" OPTIM="$TOPTIM" ./configure >/dev/null if [ $? -ne 0 ]; then echo "** FAILED to configure APR" exit 1
cvs commit: apache-2.0/src/lib/apr configure.in
rse 99/10/01 02:47:09 Modified:src/lib/apr configure.in Log: Fix typo Revision ChangesPath 1.13 +1 -1 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- configure.in 1999/10/01 09:36:30 1.12 +++ configure.in 1999/10/01 09:47:08 1.13 @@ -26,7 +26,7 @@ dnl # this is the place to put specific options for platform/compiler dnl # combinations case "$OS:$CC" in -*-hp-hpux*:cc ) CFAGS="$CFLAGS -Ae +DAportable" ;; +*-hp-hpux*:cc ) CFLAGS="$CFLAGS -Ae +DAportable" ;; esac
cvs commit: apache-2.0/src/lib/apr configure.in
rse 99/10/01 02:36:31 Modified:src/lib/apr configure.in Log: - remove bogus subshell usage and avoid test -z - remove FreeBSD hack: first SYS_SW is not set anywhere (same actually also for AIX) and second, -D__STR__ is useless on FreeBSD and -pthread should not be used always (think about Pth or other libs except FreeBSD uthread) Revision ChangesPath 1.12 +2 -6 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- configure.in 1999/09/12 12:12:00 1.11 +++ configure.in 1999/10/01 09:36:30 1.12 @@ -50,7 +50,7 @@ AC_C_INLINE # Use /bin/sh if it exists, otherwise go looking for sh in the path -if (test -z "$SH" -a -f /bin/sh); then +if test ".$SH" = . -a -f /bin/sh; then SH="/bin/sh" fi AC_CHECK_PROG(SH, sh, sh) @@ -97,7 +97,7 @@ AC_CHECK_LIB(socket,socket) AC_CHECK_LIB(ufc,crypt) -if (test "$SYS_SW" = "AIX"); then +if test ".$SYS_SW" = ".AIX"; then CFLAGS="$CFLAGS -U__STR__" case "$SYS_KV" in [12]*) @@ -110,10 +110,6 @@ AC_DEFINE(NEED_RLIM_T) ;; esac -fi - -if (test "$SYS_SW" = "FreeBSD"); then -CFLAGS="$CFLAGS -pthread -U__STR__" fi dnl Checks for header files.
