cvs commit: apache/src CHANGES
jim 96/09/08 10:31:36 Modified:src CHANGES Log: might as well... CHANGES attributes Revision ChangesPath 1.62 +6 -2 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.61 retrieving revision 1.62 diff -C3 -r1.61 -r1.62 *** CHANGES 1996/09/08 17:24:55 1.61 --- CHANGES 1996/09/08 17:31:33 1.62 *** *** 1,7 ! $Id: CHANGES,v 1.61 1996/09/08 17:24:55 ben Exp $ Changes with Apache 1.2b1: *) Fix a race condition which could cause the parent server to hang on heavily loaded systems. [Ben Laurie] --- 1,11 ! $Id: CHANGES,v 1.62 1996/09/08 17:31:33 jim Exp $ Changes with Apache 1.2b1: + *) Status module updates: prevent rollover/overflow with heavily + used systems. Add additional information, such as time + to process request and additional "states" [Jim Jagielski] + *) Fix a race condition which could cause the parent server to hang on heavily loaded systems. [Ben Laurie] *** *** 17,23 *) Somewhat cleaner Configure implementation Only a simple selection of PLATFORM is required for Configure/ Configuration to work. Concept of "Rules" added to allow ! for control of Configure's behavior. *) Add setuid/gid execution via setuid wrapper Apache can now execute CGI scripts as the User/Group of the --- 21,27 *) Somewhat cleaner Configure implementation Only a simple selection of PLATFORM is required for Configure/ Configuration to work. Concept of "Rules" added to allow ! for control of Configure's behavior. [Jim Jagielski] *) Add setuid/gid execution via setuid wrapper Apache can now execute CGI scripts as the User/Group of the
cvs commit: apache/src CHANGES http_main.c
ben 96/09/08 10:24:57
Modified:src CHANGES http_main.c
Log:
Fix race condition in wait_or_timeout (experimentally).
Revision ChangesPath
1.61 +4 -1 apache/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.60
retrieving revision 1.61
diff -C3 -r1.60 -r1.61
*** CHANGES 1996/08/24 14:39:30 1.60
--- CHANGES 1996/09/08 17:24:55 1.61
***
*** 1,6
! $Id: CHANGES,v 1.60 1996/08/24 14:39:30 ben Exp $
Changes with Apache 1.2b1:
*) Configuration flags should be either "on" or "off". Apache was not
enforcing this restriction. Fixed. [Ben Laurie]
--- 1,9
! $Id: CHANGES,v 1.61 1996/09/08 17:24:55 ben Exp $
Changes with Apache 1.2b1:
+
+ *) Fix a race condition which could cause the parent server to hang on
+ heavily loaded systems. [Ben Laurie]
*) Configuration flags should be either "on" or "off". Apache was not
enforcing this restriction. Fixed. [Ben Laurie]
1.66 +19 -1 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -C3 -r1.65 -r1.66
*** http_main.c 1996/09/08 17:14:58 1.65
--- http_main.c 1996/09/08 17:24:55 1.66
***
*** 50,56
*
*/
! /* $Id: http_main.c,v 1.65 1996/09/08 17:14:58 ben Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
--- 50,56
*
*/
! /* $Id: http_main.c,v 1.66 1996/09/08 17:24:55 ben Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
***
*** 958,963
--- 958,980
* a while...
*/
+ #if 1
+
+ static int wait_or_timeout(int *status)
+ {
+ int ret;
+
+ ret=waitpid(-1,status,WNOHANG);
+ if(ret <= 0)
+ {
+ sleep(1);
+ return -1;
+ }
+ return ret;
+ }
+
+ #else
+
static JMP_BUF wait_timeout_buf;
static void longjmp_out_of_alarm (int sig) {
***
*** 1001,1006
--- 1018,1024
return wait_or_timeout_retval;
}
+ #endif
/*
* Here follows a long bunch of generic server bookkeeping stuff...
cvs commit: apache/src Configuration.tmpl Configure
jim 96/09/08 10:18:46 Modified:src Configuration.tmpl Configure Log: Add Rule Defaults for A/UX andchange HSREGEX to WANTHSREGEX to make it more clear what theRule actually means Revision ChangesPath 1.35 +11 -9 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.34 retrieving revision 1.35 diff -C3 -r1.34 -r1.35 *** Configuration.tmpl1996/09/08 13:55:08 1.34 --- Configuration.tmpl1996/09/08 17:18:43 1.35 *** *** 1,4 ! # $Id: Configuration.tmpl,v 1.34 1996/09/08 13:55:08 ben Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should --- 1,4 ! # $Id: Configuration.tmpl,v 1.35 1996/09/08 17:18:43 jim Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should *** *** 55,73 # These are used to let Configure know that we want certain # functions. The format is: Rule RULE=value # ! # At present, only the following RULES are known: REGEX, SOCKS, STATUS ! # and BADMMAP. # # For all Rules, if set to "yes", then Configure knows we want that ! # capability and does what is required to add it in. If set to anything ! # else, or not present, then nothing is done. # ! # HSREGEX: # Apache requires a POSIX regex implementation. Harry Spencer's # excellent regex package is included with Apache and can be used # if desired. If your OS has a decent regex, you can elect to ! # not use this one by setting HSREGEX to 'no' or commenting ! # out the Rule # # SOCKS: # If SOCKS is set to 'yes', be sure that you add the sock library --- 55,75 # These are used to let Configure know that we want certain # functions. The format is: Rule RULE=value # ! # At present, only the following RULES are known: WANTHSREGEX, SOCKS, ! # STATUS and BADMMAP. # # For all Rules, if set to "yes", then Configure knows we want that ! # capability and does what is required to add it in. If set to "default" ! # then Configure makes a "best guess"; if set to anything else, or not ! # present, then nothing is done. # ! # WANTHSREGEX: # Apache requires a POSIX regex implementation. Harry Spencer's # excellent regex package is included with Apache and can be used # if desired. If your OS has a decent regex, you can elect to ! # not use this one by setting WANTHSREGEX to 'no' or commenting ! # out the Rule. The "default" action is "no" unless overruled ! # by OS specifics # # SOCKS: # If SOCKS is set to 'yes', be sure that you add the sock library *** *** 94,100 # If you have to do this, please let us know what you set and what your # platform is, by sending mail to [EMAIL PROTECTED] ! Rule HSREGEX=default Rule BADMMAP=default ### --- 96,102 # If you have to do this, please let us know what you set and what your # platform is, by sending mail to [EMAIL PROTECTED] ! Rule WANTHSREGEX=default Rule BADMMAP=default ### 1.16 +13 -11apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.15 retrieving revision 1.16 diff -C3 -r1.15 -r1.16 *** Configure 1996/09/08 16:14:55 1.15 --- Configure 1996/09/08 17:18:45 1.16 *** *** 1,5 #!/bin/sh ! # $Id: Configure,v 1.15 1996/09/08 16:14:55 jim Exp $ trap 'rm $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. --- 1,5 #!/bin/sh ! # $Id: Configure,v 1.16 1996/09/08 17:18:45 jim Exp $ trap 'rm $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. *** *** 105,112 # options) as required. Setting CC and OPTIM here has no effect # if they were set in Configure. # ! # Also, we set DEF_HSREGEX and DEF_BADMMAP to the appropriate value for each ! # platform. # # As more PLATFORMs are added to Configuration.tmpl, be sure to # add the required lines below. --- 105,112 # options) as required. Setting CC and OPTIM here has no effect # if they were set in Configure. # ! # Also, we set DEF_WANTHSREGEX and DEF_BADMMAP to the appropriate ! # value for each platform. # # As more PLATFORMs are added to Configuration.tmpl, be sure to # add the required lines below. *** *** 125,130 --- 125,132 CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE" LIBS="$LIBS -lposix -lbsd"
cvs commit: apache/src http_main.c
ben 96/09/08 10:15:00
Modified:src http_main.c
Log:
Move reap_children out of the middle of wait_or_timeout stuff.
Revision ChangesPath
1.65 +15 -15apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C3 -r1.64 -r1.65
*** http_main.c 1996/09/06 18:36:08 1.64
--- http_main.c 1996/09/08 17:14:58 1.65
***
*** 50,56
*
*/
! /* $Id: http_main.c,v 1.64 1996/09/06 18:36:08 jim Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
--- 50,56
*
*/
! /* $Id: http_main.c,v 1.65 1996/09/08 17:14:58 ben Exp $ */
/*
* httpd.c: simple http daemon for answering WWW file requests
***
*** 935,954
}
}
- /* Finally, this routine is used by the caretaker process to wait for
- * a while...
- */
-
- static JMP_BUF wait_timeout_buf;
-
- static void longjmp_out_of_alarm (int sig) {
- #if defined(NEXT) || defined(USE_LONGJMP)
- longjmp (wait_timeout_buf, 1);
- #else
- siglongjmp (wait_timeout_buf, 1);
- #endif
- }
-
#ifdef BROKEN_WAIT
/*
Some systems appear to fail to deliver dead children to wait() at times.
--- 935,940
***
*** 967,972
--- 953,972
}
}
#endif
+
+ /* Finally, this routine is used by the caretaker process to wait for
+ * a while...
+ */
+
+ static JMP_BUF wait_timeout_buf;
+
+ static void longjmp_out_of_alarm (int sig) {
+ #if defined(NEXT) || defined(USE_LONGJMP)
+ longjmp (wait_timeout_buf, 1);
+ #else
+ siglongjmp (wait_timeout_buf, 1);
+ #endif
+ }
int wait_or_timeout (int *status)
{
cvs commit: apache/src Configure CutRule Makefile.tmpl
jim 96/09/08 09:14:57
Modified:src Configure CutRule Makefile.tmpl
Log:
Log: Minor Configure fluff
Description: Map RULES to lowercase and work with OLD
shell tests
Revision ChangesPath
1.15 +9 -9 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** Configure 1996/09/08 13:52:39 1.14
--- Configure 1996/09/08 16:14:55 1.15
***
*** 1,5
#!/bin/sh
! # $Id: Configure,v 1.14 1996/09/08 13:52:39 ben Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
--- 1,5
#!/bin/sh
! # $Id: Configure,v 1.15 1996/09/08 16:14:55 jim Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
***
*** 114,120
PLAT=`grep "PLATFORM=" Makefile | awk '{ print $1 }' | awk -F= '{ print $2
}'`
! if [ "$PLAT" = "" ]; then
echo "PLATFORM has not been set!"
exit 1
fi
--- 114,120
PLAT=`grep "PLATFORM=" Makefile | awk '{ print $1 }' | awk -F= '{ print $2
}'`
! if [ "x$PLAT" = "x" ]; then
echo "PLATFORM has not been set!"
exit 1
fi
***
*** 206,212
OS='SCO 5'
CFLAGS="$CFLAGS -DSCO5"
LIBS="$LIBS -lsocket -lmalloc -lprot"
! OSBPRINTF=" -K noinline"
DEF_HSREGEX=no
DEF_BADMMAP=no
;;
--- 206,212
OS='SCO 5'
CFLAGS="$CFLAGS -DSCO5"
LIBS="$LIBS -lsocket -lmalloc -lprot"
! OSBPRINTF="-K noinline"
DEF_HSREGEX=no
DEF_BADMMAP=no
;;
***
*** 245,257
# Extract the rules
! RULE_HSREGEX=`CutRule HSREGEX`
! RULE_STATUS=`CutRule STATUS`
! RULE_SOCKS=`CutRule SOCKS`
! RULE_BADMMAP=`CutRule BADMMAP`
if [ "$RULE_HSREGEX" = "default" ]; then
! if [ "$DEF_HSREGEX" = "" ]; then
RULE_HSREGEX=no
else
RULE_HSREGEX=$DEF_HSREGEX
--- 245,257
# Extract the rules
! RULE_HSREGEX=`./CutRule HSREGEX`
! RULE_STATUS=`./CutRule STATUS`
! RULE_SOCKS=`./CutRule SOCKS`
! RULE_BADMMAP=`./CutRule BADMMAP`
if [ "$RULE_HSREGEX" = "default" ]; then
! if [ "x$DEF_HSREGEX" = "x" ]; then
RULE_HSREGEX=no
else
RULE_HSREGEX=$DEF_HSREGEX
***
*** 259,265
fi
if [ "$RULE_BADMMAP" = "default" ]; then
! if [ "$DEF_BADMMAP" = "" ]; then
RULE_BADMMAP=no
else
RULE_BADMMAP=$DEF_BADMMAP
--- 259,265
fi
if [ "$RULE_BADMMAP" = "default" ]; then
! if [ "x$DEF_BADMMAP" = "x" ]; then
RULE_BADMMAP=no
else
RULE_BADMMAP=$DEF_BADMMAP
1.2 +3 -1 apache/src/CutRule
Index: CutRule
===
RCS file: /export/home/cvs/apache/src/CutRule,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** CutRule 1996/09/08 13:52:40 1.1
--- CutRule 1996/09/08 16:14:55 1.2
***
*** 1,4
# Helper script for Configure - cut a rule from Configuration.
# note that there is a tab and a space in the character groups.
! egrep "Rule[ ]+$1[ ]*=" Configuration|cut -d= -f2|sed 's/[
]//g'
--- 1,6
# Helper script for Configure - cut a rule from Configuration.
# note that there is a tab and a space in the character groups.
+ # Map to lowercase to make tests easier
! egrep "Rule[ ]+$1[ ]*=" Configuration|cut -d= -f2|sed 's/[
]//g'\
! | tr "A-Z" "a-z"
1.25 +2 -2 apache/src/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C3 -r1.24 -r1.25
*** Makefile.tmpl 1996/09/08 12:19:09 1.24
--- Makefile.tmpl 1996/09/08 16:14:55 1.25
***
*** 1,4
! # $Id: Makefile.tmpl,v 1.24 1996/09/08 12:19:09 ben Exp $
# Apache makefile template (well, suffix).
# This is combined with the information in the "Configuration" file
--- 1,4
! # $Id: Makefile.tmpl,v 1.25 1996/09/08 16:14:55 jim Exp $
# Apache makefile template (well, suffix).
# This is combined with the information in the "Configuration" file
***
*** 14,20
md5c.o util_md5.o explain.o http_bprintf.o $(MODULES)
.c.o:
! $(CC) -c $(INCLUDES) $(CFLAGS) $<
all: Configuration httpd
--- 14,20
md5c.o util_
cvs commit: apache/src Configuration.tmpl
ben 96/09/08 06:55:09 Modified:src Configuration.tmpl Log: Whoops. Missed out a small comment. Revision ChangesPath 1.34 +5 -3 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.33 retrieving revision 1.34 diff -C3 -r1.33 -r1.34 *** Configuration.tmpl1996/09/08 13:52:39 1.33 --- Configuration.tmpl1996/09/08 13:55:08 1.34 *** *** 1,4 ! # $Id: Configuration.tmpl,v 1.33 1996/09/08 13:52:39 ben Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should --- 1,4 ! # $Id: Configuration.tmpl,v 1.34 1996/09/08 13:55:08 ben Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should *** *** 84,97 # If you find that your OS can't cope with mmap (compiles OKAY but refuses # to run and moans "httpd: Could not mmap memory" .. or similar) set # this to 'yes'. ! # ! # Rule STATUS=yes Rule SOCKS=no # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for ! # your platform) you may override them here. Rule HSREGEX=default Rule BADMMAP=default --- 84,99 # If you find that your OS can't cope with mmap (compiles OKAY but refuses # to run and moans "httpd: Could not mmap memory" .. or similar) set # this to 'yes'. ! Rule STATUS=yes Rule SOCKS=no # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for ! # your platform), or are set incorrectly, you may override them here. ! # If you have to do this, please let us know what you set and what your ! # platform is, by sending mail to [EMAIL PROTECTED] ! Rule HSREGEX=default Rule BADMMAP=default
cvs commit: apache/src CutRule Configuration.tmpl Configure
ben 96/09/08 06:52:41
Modified:src Configuration.tmpl Configure
Added: src CutRule
Log:
Make HSREGEX and BADMMAP per-platform configurable, with override. Tidy up the
way rules are parsed as a side-effect.
Revision ChangesPath
1.33 +7 -3 apache/src/Configuration.tmpl
Index: Configuration.tmpl
===
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C3 -r1.32 -r1.33
*** Configuration.tmpl1996/08/21 18:40:00 1.32
--- Configuration.tmpl1996/09/08 13:52:39 1.33
***
*** 1,4
! # $Id: Configuration.tmpl,v 1.32 1996/08/21 18:40:00 akosut Exp $
# Config file for the Apache httpd.
# Configuration.tmpl is the template for Configuration. Configuration should
--- 1,4
! # $Id: Configuration.tmpl,v 1.33 1996/09/08 13:52:39 ben Exp $
# Config file for the Apache httpd.
# Configuration.tmpl is the template for Configuration. Configuration should
***
*** 86,95
# this to 'yes'.
#
#
- Rule HSREGEX=yes
Rule STATUS=yes
Rule SOCKS=no
! Rule BADMMAP=no
###
#
--- 86,99
# this to 'yes'.
#
#
Rule STATUS=yes
Rule SOCKS=no
!
! # The following rules should be set automatically by Configure. However, if
! # they are not set by Configure (because we don't know the correct value for
! # your platform) you may override them here.
! Rule HSREGEX=default
! Rule BADMMAP=default
###
#
1.14 +47 -5 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.13
retrieving revision 1.14
diff -C3 -r1.13 -r1.14
*** Configure 1996/08/21 18:40:02 1.13
--- Configure 1996/09/08 13:52:39 1.14
***
*** 1,5
#!/bin/sh
! # $Id: Configure,v 1.13 1996/08/21 18:40:02 akosut Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
--- 1,5
#!/bin/sh
! # $Id: Configure,v 1.14 1996/09/08 13:52:39 ben Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
***
*** 105,116
--- 105,124
# options) as required. Setting CC and OPTIM here has no effect
# if they were set in Configure.
#
+ # Also, we set DEF_HSREGEX and DEF_BADMMAP to the appropriate value for each
+ # platform.
+ #
# As more PLATFORMs are added to Configuration.tmpl, be sure to
# add the required lines below.
#
PLAT=`grep "PLATFORM=" Makefile | awk '{ print $1 }' | awk -F= '{ print $2
}'`
+ if [ "$PLAT" = "" ]; then
+ echo "PLATFORM has not been set!"
+ exit 1
+ fi
+
case "$PLAT" in
A/UX)
OS='A/UX 3.1.x'
***
*** 199,204
--- 207,214
CFLAGS="$CFLAGS -DSCO5"
LIBS="$LIBS -lsocket -lmalloc -lprot"
OSBPRINTF=" -K noinline"
+ DEF_HSREGEX=no
+ DEF_BADMMAP=no
;;
SOLARIS2)
OS='Solaris 2'
***
*** 233,244
--- 243,286
;;
esac
+ # Extract the rules
+
+ RULE_HSREGEX=`CutRule HSREGEX`
+ RULE_STATUS=`CutRule STATUS`
+ RULE_SOCKS=`CutRule SOCKS`
+ RULE_BADMMAP=`CutRule BADMMAP`
+
+ if [ "$RULE_HSREGEX" = "default" ]; then
+ if [ "$DEF_HSREGEX" = "" ]; then
+ RULE_HSREGEX=no
+ else
+ RULE_HSREGEX=$DEF_HSREGEX
+ fi
+ fi
+
+ if [ "$RULE_BADMMAP" = "default" ]; then
+ if [ "$DEF_BADMMAP" = "" ]; then
+ RULE_BADMMAP=no
+ else
+ RULE_BADMMAP=$DEF_BADMMAP
+ fi
+ fi
+
+ # Show the final values of the rules
+
+ echo "# Platform: $OS" >> Makefile
+ echo "# Final Rules:" >> Makefile
+ echo "# Rule HSREGEX=$RULE_HSREGEX" >> Makefile
+ echo "# Rule BADMMAP=$RULE_BADMMAP" >> Makefile
+ echo "###" >> Makefile
+
#
# Now that _that's_ done, get on with it
#
echo "Configured for $OS platform"
echo
+
#
# Handle the setting of CC and OPTIM. The values in Configure
# have priority. If not set there, then we check if they were
***
*** 266,272
#
STAT_MOD="mod_status"
if grep "$STAT_MOD" Makefile > /dev/null; then
! if grep "Rule:STATUS=yes" Makefile > /dev/null; then
CFLAGS="$CFLAGS -DSTATUS"
fi
fi
--- 308,314
#
STAT_MOD="mod_status"
if grep "$STAT_MOD" Makefile > /dev/null; then
! if [ "$RULE_STATUS" = "yes" ]; then
CFLAGS="$CFLAGS -DSTATUS"
fi
fi
***
*** 274,280
#
#
cvs commit: apache/src mod_cookies.c
ben 96/09/08 05:25:31
Modified:src mod_cookies.c
Log:
Use strchr instead of index.
Revision ChangesPath
1.15 +2 -2 apache/src/mod_cookies.c
Index: mod_cookies.c
===
RCS file: /export/home/cvs/apache/src/mod_cookies.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** mod_cookies.c 1996/08/24 14:41:32 1.14
--- mod_cookies.c 1996/09/08 12:25:30 1.15
***
*** 50,56
*
*/
! /* $Id: mod_cookies.c,v 1.14 1996/08/24 14:41:32 ben Exp $ */
/* User Tracking Module
*
--- 50,56
*
*/
! /* $Id: mod_cookies.c,v 1.15 1996/09/08 12:25:30 ben Exp $ */
/* User Tracking Module
*
***
*** 257,263
/* { }* */
while ( word[0] ) {
/* */
! if ( index("0123456789", word[0]) != NULL )
num = atoi( word );
else
return "bad expires code, numeric value expected.";
--- 257,263
/* { }* */
while ( word[0] ) {
/* */
! if ( strchr("0123456789", word[0]) != NULL )
num = atoi( word );
else
return "bad expires code, numeric value expected.";
cvs commit: apache/src Makefile.tmpl
ben 96/09/08 05:19:10 Modified:src Makefile.tmpl Log: Restore missing space. Revision ChangesPath 1.24 +2 -2 apache/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.23 retrieving revision 1.24 diff -C3 -r1.23 -r1.24 *** Makefile.tmpl 1996/08/20 11:50:35 1.23 --- Makefile.tmpl 1996/09/08 12:19:09 1.24 *** *** 1,4 ! # $Id: Makefile.tmpl,v 1.23 1996/08/20 11:50:35 paul Exp $ # Apache makefile template (well, suffix). # This is combined with the information in the "Configuration" file --- 1,4 ! # $Id: Makefile.tmpl,v 1.24 1996/09/08 12:19:09 ben Exp $ # Apache makefile template (well, suffix). # This is combined with the information in the "Configuration" file *** *** 44,50 # Work around broken compilers http_bprintf.o: http_bprintf.c ! $(CC) -c $(INCLUDES) $(CFLAGS)$(BROKEN_BPRINTF_FLAGS) http_bprintf.c #Dependencies #Core code --- 44,50 # Work around broken compilers http_bprintf.o: http_bprintf.c ! $(CC) -c $(INCLUDES) $(CFLAGS) $(BROKEN_BPRINTF_FLAGS) http_bprintf.c #Dependencies #Core code
