cvs commit: apachen/src CHANGES Configure
dgaudet 97/11/02 20:33:19 Modified:src CHANGES Configure Log: Warn user about default path change if /usr/local/etc/httpd is found. Submitted by: Lars Eilebrecht Reviewed by: Martin Kraemer, Dean Gaudet Revision ChangesPath 1.483 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.482 retrieving revision 1.483 diff -u -r1.482 -r1.483 --- CHANGES 1997/10/30 19:20:48 1.482 +++ CHANGES 1997/11/03 04:33:16 1.483 @@ -1,5 +1,8 @@ Changes with Apache 1.3b3 + *) Warn user that default path has changed if /usr/local/etc/httpd + is found on the system. [Lars Eilebrecht] + *) Various mod_mime_magic bug fixes and cleanups: Uncompression should work, it should work on WIN32, and a few resource leaks and abort conditions are fixed. 1.166 +18 -0 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- Configure 1997/10/27 19:10:33 1.165 +++ Configure 1997/11/03 04:33:17 1.166 @@ -98,6 +98,24 @@ if [ -f modules.c ] ; then mv modules.c modules.c.bak; fi +# If we find the directory /usr/local/etc/httpd and there is +# no HTTPD_ROOT flag set in the Configuration file we assume +# that the user was using the old default root directory +# and issue a notice about it. +# + +test ! -d /usr/local/etc/httpd/ \ + || if ! egrep '^EXTRA_CFLAGS.*HTTPD_ROOT' $file /dev/null +then + echo | Please note that the default httpd root directory has changed + echo | from '/usr/local/etc/httpd/' to '/usr/local/apache/.' + echo | You may add '-DHTTPD_ROOT=\\\/usr/local/etc/httpd\\\' to EXTRA_CFLAGS + echo | in your Configuration file (and re-run Configure) or start + echo | httpd with the option '-d /usr/local/etc/httpd' if you still + echo | want to use the old root directory for your server. +fi + + # Start creating the Makefile. We add some comments and # then fold in the modules that were included in Configuration #
cvs commit: apachen/src/main http_main.c
dgaudet 97/11/03 02:11:44
Modified:src CHANGES
src/main http_main.c
Log:
Fix a mild race condition in unblock_alarms() involving a SIGALRM showing
up after a SIGTERM.
PR: 1211
Reviewed by: Marc Slemko, Martin Kraemer
Revision ChangesPath
1.484 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.483
retrieving revision 1.484
diff -u -r1.483 -r1.484
--- CHANGES 1997/11/03 04:33:16 1.483
+++ CHANGES 1997/11/03 10:11:39 1.484
@@ -1,5 +1,8 @@
Changes with Apache 1.3b3
+ *) A mild SIGTERM/SIGALRM race condition was eliminated.
+ [Dean Gaudet] PR#1211
+
*) Warn user that default path has changed if /usr/local/etc/httpd
is found on the system. [Lars Eilebrecht]
1.243 +28 -27apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -r1.242 -r1.243
--- http_main.c 1997/11/01 22:15:59 1.242
+++ http_main.c 1997/11/03 10:11:42 1.243
@@ -678,6 +678,14 @@
}
#endif
+/* a clean exit from a child with proper cleanup */
+static void __attribute__((noreturn)) clean_child_exit(int code)
+{
+child_exit_modules(pconf, server_conf);
+destroy_pool(pconf);
+exit(code);
+}
+
void timeout(int sig)
{/* Also called on SIGPIPE */
char errstr[MAX_STRING_LEN];
@@ -688,6 +696,9 @@
alarm_pending = 1;
return;
}
+if (exit_after_unblock) {
+ clean_child_exit(0);
+}
if (!current_conn) {
ap_longjmp(jmpbuffer, 1);
@@ -760,10 +771,16 @@
--alarms_blocked;
if (alarms_blocked == 0) {
if (exit_after_unblock) {
+ /* We have a couple race conditions to deal with here, we can't
+ * allow a timeout that comes in this small interval to allow
+ * the child to jump back to the main loop. Instead we block
+ * alarms again, and then note that exit_after_unblock is
+ * being dealt with. We choose this way to solve this so that
+ * the common path through unblock_alarms() is really short.
+ */
+ ++alarms_blocked;
exit_after_unblock = 0;
- child_exit_modules(pconf, server_conf);
- destroy_pool(pconf);
- exit(0);
+ clean_child_exit(0);
}
if (alarm_pending) {
alarm_pending = 0;
@@ -1964,9 +1981,7 @@
exit_after_unblock = 1;
}
else {
- child_exit_modules(pconf, server_conf);
- destroy_pool(pconf);
- exit(0);
+ clean_child_exit(0);
}
}
@@ -2668,16 +2683,12 @@
sync_scoreboard_image();
if (scoreboard_image-global.exit_generation = generation) {
- child_exit_modules(pconf, server_conf);
- destroy_pool(pconf);
- exit(0);
+ clean_child_exit(0);
}
if ((max_requests_per_child 0
++requests_this_child = max_requests_per_child)) {
- child_exit_modules(pconf, server_conf);
- destroy_pool(pconf);
- exit(0);
+ clean_child_exit(0);
}
(void) update_child_status(my_child_num, SERVER_READY, (request_rec *)
NULL);
@@ -2700,9 +2711,7 @@
if (errno == EFAULT) {
aplog_error(APLOG_MARK, APLOG_ERR, server_conf,
select: (listen) fatal, child exiting);
- child_exit_modules(pconf, server_conf);
- destroy_pool(pconf);
- exit(1);
+ clean_child_exit(1);
}
#endif
aplog_error(APLOG_MARK, APLOG_ERR, server_conf, select:
(listen));
@@ -2733,9 +2742,7 @@
break;
if (deferred_die) {
/* we didn't get a socket, and we were told to die */
- child_exit_modules(pconf, server_conf);
- destroy_pool(pconf);
- exit(0);
+ clean_child_exit(0);
}
}
@@ -2758,18 +2765,14 @@
usr1_just_die = 1;
if (deferred_die) {
/* ok maybe not, see ya later */
- child_exit_modules(pconf, server_conf);
- destroy_pool(pconf);
- exit(0);
+ clean_child_exit(0);
}
/* or maybe we missed a signal, you never know on systems
* without reliable signals
*/
cvs commit: apachen ABOUT_APACHE
sameer 97/11/03 10:39:43 Modified:.ABOUT_APACHE Log: update affiliations Revision ChangesPath 1.6 +2 -2 apachen/ABOUT_APACHE Index: ABOUT_APACHE === RCS file: /export/home/cvs/apachen/ABOUT_APACHE,v retrieving revision 1.5 retrieving revision 1.6 diff -c -u -r1.5 -r1.6 /usr/bin/diff: conflicting specifications of output style --- ABOUT_APACHE 1997/08/09 16:11:10 1.5 +++ ABOUT_APACHE 1997/11/03 18:39:42 1.6 @@ -71,7 +71,7 @@ Brian Behlendorf Organic Online, California Ken Coar Process Software Corporation, New England, USA - Mark J. CoxUKWeb, UK + Mark J. CoxC2Net Europe, UK Ralf S. EngelschallMunich, Germany. Roy T. FieldingUC Irvine, California Dean GaudetSteam Tunnel Operations, California @@ -83,7 +83,7 @@ Doug MacEachernTOG Research Institute, Massachusetts Aram W. Mirzadeh Qosina Corporation, New York Sameer Parekh C2Net, California - Paul SuttonUKWeb, UK + Paul SuttonC2Net Europe, UK Marc SlemkoCanada Randy Terbush Zyzzyva ISP, Nebraska Dirk-Willem van Gulik Freelance Consultant, Italy
cvs commit: apache-site/contributors index.html
sameer 97/11/03 10:41:42 Modified:.ABOUT_APACHE.html contributors index.html Log: update affiliations Revision ChangesPath 1.7 +2 -2 apache-site/ABOUT_APACHE.html Index: ABOUT_APACHE.html === RCS file: /export/home/cvs/apache-site/ABOUT_APACHE.html,v retrieving revision 1.6 retrieving revision 1.7 diff -c -u -r1.6 -r1.7 /usr/bin/diff: conflicting specifications of output style --- ABOUT_APACHE.html 1997/08/10 15:08:50 1.6 +++ ABOUT_APACHE.html 1997/11/03 18:41:40 1.7 @@ -156,7 +156,7 @@ TR TDMark J. Coxnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD - TDUKWeb, UK + TDC2Net Europe, UK /TD /TR TR @@ -228,7 +228,7 @@ TR TDPaul Suttonnbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp; /TD - TDUKWeb, UK + TDC2Net Europe, UK /TD /TR TR 1.19 +3 -3 apache-site/contributors/index.html Index: index.html === RCS file: /export/home/cvs/apache-site/contributors/index.html,v retrieving revision 1.18 retrieving revision 1.19 diff -c -u -r1.18 -r1.19 /usr/bin/diff: conflicting specifications of output style --- index.html1997/10/15 12:24:02 1.18 +++ index.html1997/11/03 18:41:41 1.19 @@ -177,8 +177,8 @@ BName:/B A NAME=coxMark Cox/ABR Bemail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR BURL:/B A HREF=http://www.awe.com/~mark/;http://www.awe.com/~mark//ABR -BOrganization:/B UK Web LtdBR -BOccupation:/B Technical DirectorBR +BOrganization:/B C2Net Europe, Ltd. +BOccupation:/B Managing DirectorBR BLocation:/B Leeds, EnglandBR BContributions:/B Various patches, bug fixes, and DBM code alterations bringing Apache in line with what we were using on www.telescope.org. Cookie @@ -409,7 +409,7 @@ BName:/B A NAME=suttonPaul Sutton/ABR BEmail:/B A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR BURL:/B A HREF=http://www.ukweb.com/~paul/; http://www.ukweb.com/~paul/ BR/A -BOrganization:/B UK Web LtdBR +BOrganization:/B C2Net Europe, LtdBR BOccupation:/B Technical Director BR BLocation:/B Leeds, UKBR BComments:/B I like documenting things, I really do. Why are you wearing white suits?BR
cvs commit: apachen/htdocs/manual/misc perf.html
brian 97/11/03 15:34:06 Modified:htdocs/manual/misc perf.html Log: Remove broken link, improve context of existing one Revision ChangesPath 1.14 +5 -3 apachen/htdocs/manual/misc/perf.html Index: perf.html === RCS file: /export/home/cvs/apachen/htdocs/manual/misc/perf.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perf.html 1997/09/30 23:24:30 1.13 +++ perf.html 1997/11/03 23:34:05 1.14 @@ -107,13 +107,15 @@ the following URL for tips on how to expand the capabilities if you are finding slowdowns and lags are hurting performance. +P + +Other links: + UL LIA href=http://www.sun.com/sun-on-net/performance.html; World Wide Web Server Performance, -lt;http://www.sun.com/sun-on-net/Sun.Internet.Solutions/performance/gt;/a -LIA HREF=http://www.sun.com/solaris/products/siss/; -Solaris Internet Server Supplement for 2.5.1/A +lt;http://www.sun.com/sun-on-net/performance.htmlgt;/a /UL PHR
