rse 98/06/29 04:41:50
Modified: src CHANGES
src/main http_main.c
Log:
Move the initial suEXEC-related startup message from plain fprintf()/stderr to
a delayed ap_log_error()-based one to avoid problems when Apache is started
from inetd (instead of standalone). Under this situation startup messages on
stderr lead to problems (the line is sent to the client in front of the
requested document).
Now the following occurs in the error_log:
[Mon Jun 29 13:37:38 1998] [notice] Apache/1.3.1-dev (Unix) configured --
resuming normal operations
[Mon Jun 29 13:37:38 1998] [info] Server built: Jun 29 1998 13:37:13
[Mon Jun 29 13:37:38 1998] [info] suEXEC mechanism enabled (wrapper:
/tmp/apache/sbin/suexec)
PR: 871, 1318
Revision Changes Path
1.937 +7 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.936
retrieving revision 1.937
diff -u -r1.936 -r1.937
--- CHANGES 1998/06/28 14:43:16 1.936
+++ CHANGES 1998/06/29 11:41:47 1.937
@@ -1,5 +1,12 @@
Changes with Apache 1.3.1
+ *) Move the initial suEXEC-related startup message from plain
+ fprintf()/stderr to a delayed ap_log_error()-based one to avoid problems
+ when Apache is started from inetd (instead of standalone). Under this
+ situation startup messages on stderr lead to problems (the line is sent
+ to the client in front of the requested document).
+ [Ralf S. Engelschall] PR#871, PR#1318
+
*) Add a flag so ap_fnmatch() can be used for case-blind pattern matching.
[Ken Coar, Dean Gaudet]
1.369 +4 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- http_main.c 1998/06/26 21:15:18 1.368
+++ http_main.c 1998/06/29 11:41:48 1.369
@@ -2753,7 +2753,6 @@
if ((wrapper.st_mode & S_ISUID) && wrapper.st_uid == 0) {
ap_suexec_enabled = 1;
- fprintf(stderr, "Configuring Apache for use with suexec wrapper.\n");
}
#endif /* ndef WIN32 */
return (ap_suexec_enabled);
@@ -4066,6 +4065,10 @@
ap_get_server_version());
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
"Server built: %s", ap_get_server_built());
+ if (ap_suexec_enabled) {
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_INFO, server_conf,
+ "suEXEC mechanism enabled (wrapper: %s)", SUEXEC_BIN);
+ }
restart_pending = shutdown_pending = 0;
while (!restart_pending && !shutdown_pending) {
