coar 97/08/23 19:51:38
Modified: src CHANGES Makefile.tmpl
src/main http_main.c httpd.h
Log:
Enhance the "server is ready" message in the error_log to include
server link-time. Of course, that means we have to create a
module at link-time that contains this, so the Makefile template
got twiddled.
Revision Changes Path
1.414 +6 -0 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- CHANGES 1997/08/23 22:59:08 1.413
+++ CHANGES 1997/08/24 02:51:32 1.414
@@ -1,5 +1,11 @@
Changes with Apache 1.3a2
+ *) Add the server version (SERVER_VERSION macro) to the "server
+ configured and running" entry in the error_log. Also build an
+ object file at link-time that contains the current time
+ (SERVER_BUILT global const char[]), and include that in the
+ message. [Ken Coar]
+
*) Set r->headers_out when sending responses from the proxy.
This fixes things such as the logging of headers sent from
the proxy. PR#659 [Marc Slemko]
1.59 +4 -1 apachen/src/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apachen/src/Makefile.tmpl,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Makefile.tmpl 1997/08/23 03:36:09 1.58
+++ Makefile.tmpl 1997/08/24 02:51:33 1.59
@@ -32,7 +32,10 @@
@false
httpd: $(REGLIB) $(OBJS)
- $(CC) $(LDFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
+ rm -f buildmark.c
+ echo 'const char SERVER_BUILT[] = "'`/bin/date`'";' > buildmark.c
+ $(CC) -c buildmark.c
+ $(CC) $(LDFLAGS) -o httpd buildmark.o $(OBJS) $(REGLIB) $(LIBS)
regex/libregex.a:
(cd regex; $(MAKE) lib CC='$(CC)' AUX_CFLAGS='$(CFLAGS)'
RANLIB='$(RANLIB)')
1.206 +1 -0 apachen/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- http_main.c 1997/08/23 16:55:31 1.205
+++ http_main.c 1997/08/24 02:51:36 1.206
@@ -3126,6 +3126,7 @@
log_printf (server_conf, "Apache HTTP Server version: %s",
SERVER_VERSION);
+ log_printf (server_conf, "Server built: %s", SERVER_BUILT);
log_error ("Server configured -- resuming normal operations",
server_conf);
restart_pending = 0;
1.144 +1 -0 apachen/src/main/httpd.h
Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- httpd.h 1997/08/23 16:17:13 1.143
+++ httpd.h 1997/08/24 02:51:36 1.144
@@ -359,6 +359,7 @@
#else
#define SERVER_VERSION SERVER_BASEVERSION
#endif
+extern MODULE_VAR_EXPORT const char SERVER_BUILT[];
/* Numeric release version identifier: major minor bugfix betaseq
* Always increases along the same track as the source branch.
