cvs commit: apache-1.3/src/support apxs.pl
wsanchez99/08/27 16:31:09
Modified:src/support apxs.pl
Log:
When apxs compiles a .o file, it cc puts it into the current working
directory. But then we're looking for the .o file in the directory that
contains the .c file, and the link line breaks. So lets remove the path to the
.c file when adding to @objs.
Revision ChangesPath
1.26 +1 -0 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apxs.pl 1999/07/24 18:05:02 1.25
+++ apxs.pl 1999/08/27 23:31:00 1.26
@@ -369,6 +369,7 @@
foreach $s (@srcs) {
my $o = $s;
$o =~ s|\.c$|.o|;
+$o =~ s|^.*/||;
push(@cmds, $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c $s);
unshift(@objs, $o);
}
cvs commit: apache-1.3/src/main http_config.c
fielding99/08/27 16:38:11
Modified:src CHANGES
src/main http_config.c
Log:
Move handler not found warning message to below the check
for a wildcard handler. Gee, you'd think someone would have
fixed it before seven PRs.
PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
Submitted by: Dirk [EMAIL PROTECTED], Roy Fielding
Revision ChangesPath
1.1425+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1424
retrieving revision 1.1425
diff -u -r1.1424 -r1.1425
--- CHANGES 1999/08/19 09:07:32 1.1424
+++ CHANGES 1999/08/27 23:38:05 1.1425
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Move handler not found warning message to below the check
+ for a wildcard handler. [Dirk [EMAIL PROTECTED], Roy Fielding]
+ PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
+
*) Build errors in src/support stop with an error, just like all the
other recursive make calls. [David Harris [EMAIL PROTECTED]]
1.147 +4 -5 apache-1.3/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_config.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- http_config.c 1999/08/06 16:21:33 1.146
+++ http_config.c 1999/08/27 23:38:10 1.147
@@ -512,11 +512,6 @@
}
}
-if (result == HTTP_INTERNAL_SERVER_ERROR r-handler) {
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
-handler \%s\ not found for: %s, r-handler, r-filename);
-}
-
/* Pass two --- wildcard matches */
for (handp = wildhandlers; handp-hr.content_type; ++handp) {
@@ -529,6 +524,10 @@
}
}
+if (result == HTTP_INTERNAL_SERVER_ERROR r-handler r-filename) {
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
+handler \%s\ not found for: %s, r-handler, r-filename);
+}
return HTTP_INTERNAL_SERVER_ERROR;
}
cvs commit: apache-2.0/src/main http_config.c
fielding99/08/27 16:47:10
Modified:src CHANGES
src/main http_config.c
Log:
Move handler not found warning message to below the check
for a wildcard handler. Gee, you'd think someone would have
fixed it before seven PRs.
PR: 2584, 3349, 3436, 3548, 4384, 4795, 4807
Submitted by: Dirk [EMAIL PROTECTED], Roy Fielding
Revision ChangesPath
1.3 +4 -0 apache-2.0/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CHANGES 1999/08/27 14:37:13 1.2
+++ CHANGES 1999/08/27 23:47:08 1.3
@@ -1,5 +1,9 @@
Changes with Apache 2.0-dev
+ *) Move handler not found warning message to below the check
+ for a wildcard handler. [Dirk [EMAIL PROTECTED], Roy Fielding]
+ PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807
+
*) Support line-continuation feature in config.option file.
[Ralf S. Engelschall]
1.7 +4 -5 apache-2.0/src/main/http_config.c
Index: http_config.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- http_config.c 1999/08/27 22:03:06 1.6
+++ http_config.c 1999/08/27 23:47:09 1.7
@@ -338,11 +338,6 @@
}
}
-if (result == HTTP_INTERNAL_SERVER_ERROR r-handler) {
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
-handler \%s\ not found for: %s, r-handler, r-filename);
-}
-
/* Pass two --- wildcard matches */
for (handp = wildhandlers; handp-hr.content_type; ++handp) {
@@ -355,6 +350,10 @@
}
}
+if (result == HTTP_INTERNAL_SERVER_ERROR r-handler r-filename) {
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, r,
+handler \%s\ not found for: %s, r-handler, r-filename);
+}
return HTTP_INTERNAL_SERVER_ERROR;
}
cvs commit: apache-2.0/src CHANGES
fielding99/08/27 17:36:41 Modified:src CHANGES Log: make that eight PRs. Revision ChangesPath 1.4 +1 -1 apache-2.0/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-2.0/src/CHANGES,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- CHANGES 1999/08/27 23:47:08 1.3 +++ CHANGES 1999/08/28 00:36:40 1.4 @@ -2,7 +2,7 @@ *) Move handler not found warning message to below the check for a wildcard handler. [Dirk [EMAIL PROTECTED], Roy Fielding] - PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 + PR#2584, PR#2751, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 *) Support line-continuation feature in config.option file. [Ralf S. Engelschall]
cvs commit: apache-1.3/src CHANGES
fielding99/08/27 17:59:04 Modified:src CHANGES Log: make that eight PRs Revision ChangesPath 1.1426+1 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1425 retrieving revision 1.1426 diff -u -r1.1425 -r1.1426 --- CHANGES 1999/08/27 23:38:05 1.1425 +++ CHANGES 1999/08/28 00:58:54 1.1426 @@ -2,7 +2,7 @@ *) Move handler not found warning message to below the check for a wildcard handler. [Dirk [EMAIL PROTECTED], Roy Fielding] - PR#2584, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 + PR#2584, PR#2751, PR#3349, PR#3436, PR#3548, PR#4384, PR#4795, PR#4807 *) Build errors in src/support stop with an error, just like all the other recursive make calls. [David Harris [EMAIL PROTECTED]]
cvs commit: apache-1.3/htdocs .cvsignore
fielding99/08/27 18:11:49 Modified:..cvsignore Removed: htdocs .cvsignore Log: Don't ignore everything when everything isn't supposed to be ignored. If this bugs configure users, then fix configure so that it uses a distinctive prefix that won't match Makefile.tmpl. Submitted by: Roy Fielding, Sander van Zoest Revision ChangesPath 1.4 +0 -1 apache-1.3/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-1.3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore1998/06/16 03:28:45 1.3 +++ .cvsignore1999/08/28 01:11:47 1.4 @@ -1,4 +1,3 @@ Makefile config.status -Makefile.* src.*
cvs commit: apache-2.0 .cvsignore
fielding99/08/27 18:13:27 Modified:..cvsignore Log: Don't ignore everything when everything isn't supposed to be ignored. If this bugs configure users, then fix configure so that it uses a distinctive prefix that won't match Makefile.tmpl. Submitted by: Roy Fielding, Sander van Zoest Revision ChangesPath 1.3 +0 -1 apache-2.0/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/08/26 04:57:01 1.2 +++ .cvsignore1999/08/28 01:13:22 1.3 @@ -1,5 +1,4 @@ Makefile config.status config.status.* -Makefile.* src.*
cvs commit: apache-2.0/src/main http_config.c
stoddard99/08/27 19:34:38 Modified:src/main http_config.c Log: Fix merge bug Revision ChangesPath 1.8 +1 -0 apache-2.0/src/main/http_config.c Index: http_config.c === RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- http_config.c 1999/08/27 23:47:09 1.7 +++ http_config.c 1999/08/28 02:34:37 1.8 @@ -1119,6 +1119,7 @@ access to be safe); return HTTP_FORBIDDEN; } +} /* cache it */ new = ap_palloc(r-pool, sizeof(struct htaccess_result));
cvs commit: apache-2.0 STATUS
fielding99/08/27 19:44:10 Modified:.STATUS Log: no shortage of things TODO Revision ChangesPath 1.3 +3 -1 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- STATUS1999/08/27 19:02:51 1.2 +++ STATUS1999/08/28 02:44:09 1.3 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/08/27 19:02:51 $] +Last modified at [$Date: 1999/08/28 02:44:09 $] Release: @@ -57,6 +57,8 @@ * Finish infrastructure in core for async MPMs Status: ? + +* TODO in source -- just do an egrep on TODO and see what's there * Work on other MPMs. Possible MPMs discussed or in progress include:
cvs commit: apache-1.3/src/main http_core.c
fielding99/08/27 19:51:32
Modified:src/main http_core.c
Log:
Reverse a change that was made in rev 1.227 because the old version
was better (and consistent with what was left in Apache 2.0).
Revision ChangesPath
1.272 +4 -10 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- http_core.c 1999/08/09 07:29:29 1.271
+++ http_core.c 1999/08/28 02:51:31 1.272
@@ -3037,16 +3037,10 @@
}
if (r-finfo.st_mode == 0 || (r-path_info *r-path_info)) {
- char *emsg;
-
- emsg = File does not exist: ;
- if (r-path_info == NULL) {
- emsg = ap_pstrcat(r-pool, emsg, r-filename, NULL);
- }
- else {
- emsg = ap_pstrcat(r-pool, emsg, r-filename, r-path_info, NULL);
- }
- ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r, %s, emsg);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, r,
+ File does not exist: %s,r-path_info ?
+ ap_pstrcat(r-pool, r-filename, r-path_info, NULL)
+ : r-filename);
return HTTP_NOT_FOUND;
}
if (r-method_number != M_GET) {
cvs commit: apache-2.0/src/regex regex2.h
fielding99/08/27 20:03:35 Modified:src/include hsregex.h src/lib/apr/include hsregex.h src/regex regex2.h Log: Change defined(RHAPSODY) to defined(MAC_OS) || defined(MAC_OS_X_SERVER) to match the rest of the server. Revision ChangesPath 1.3 +1 -1 apache-2.0/src/include/hsregex.h Index: hsregex.h === RCS file: /home/cvs/apache-2.0/src/include/hsregex.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hsregex.h 1999/08/26 07:21:43 1.2 +++ hsregex.h 1999/08/28 03:03:32 1.3 @@ -16,7 +16,7 @@ #endif #endif -#if defined(RHAPSODY) +#if defined(MAC_OS) || defined(MAC_OS_X_SERVER) #define ap_private_extern __private_extern__ #else #define ap_private_extern 1.2 +1 -1 apache-2.0/src/lib/apr/include/hsregex.h Index: hsregex.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/hsregex.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hsregex.h 1999/08/17 15:59:53 1.1 +++ hsregex.h 1999/08/28 03:03:34 1.2 @@ -16,7 +16,7 @@ #endif #endif -#if defined(RHAPSODY) +#if defined(MAC_OS) || defined(MAC_OS_X_SERVER) #define ap_private_extern __private_extern__ #else #define ap_private_extern 1.9 +1 -1 apache-2.0/src/regex/regex2.h Index: regex2.h === RCS file: /home/cvs/apache-2.0/src/regex/regex2.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- regex2.h 1998/10/19 02:16:28 1.8 +++ regex2.h 1999/08/28 03:03:34 1.9 @@ -8,7 +8,7 @@ = #endif = #endif = - = #if defined(RHAPSODY) + = #if defined(MAC_OS) || defined(MAC_OS_X_SERVER) = #define ap_private_extern __private_extern__ = #else = #define ap_private_extern
cvs commit: apache-2.0 STATUS
fielding99/08/27 20:25:05 Modified:.STATUS Log: Enough for one week. Revision ChangesPath 1.4 +17 -1 apache-2.0/STATUS Index: STATUS === RCS file: /home/cvs/apache-2.0/STATUS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- STATUS1999/08/28 02:44:09 1.3 +++ STATUS1999/08/28 03:25:04 1.4 @@ -1,5 +1,5 @@ Apache 2.0 STATUS: -Last modified at [$Date: 1999/08/28 02:44:09 $] +Last modified at [$Date: 1999/08/28 03:25:04 $] Release: @@ -53,6 +53,11 @@ behavior. Dean has suggested getting rid of regex containers completely. +* Areas where APRFile is being used need to be cleaned-up + +* mod_mmap_static hides ap_block_alarms() and ap_unblock_alarms() + This should really be done in some header file elsewhere. + Other features that need writing: * Finish infrastructure in core for async MPMs @@ -60,6 +65,8 @@ * TODO in source -- just do an egrep on TODO and see what's there +* Odd comments in source (egrep for ZZZ) need to be cleaned-up + * Work on other MPMs. Possible MPMs discussed or in progress include: - David Reid's [EMAIL PROTECTED] Beos MPM @@ -82,6 +89,12 @@ Status: Ben Laurie has written some hooks documentation (apache-2.0/htdocs/hooks.html) +* Changes since 1.3.9 can be more easily seen in the commitlog file + dev.apache.org:/home/cvs/CVSROOT/commitlogs/apache-2.0 + which includes some of Roy's comments when the changes were + committed in rough change-sets by purpose. Note that the commitlog + does not show the contents of new files until later. + Available Patches: * Mike Abbott's [EMAIL PROTECTED] patches to improve @@ -94,3 +107,6 @@ * What do we do about mod_proxy? * Which MPMs will be included with Apache 2.0? + + * Is conf/highperformance.conf-dist obsolete? It looks obsolete. +
cvs commit: apache-2.0/src/lib/apr/threadproc/os2 proc.c
bjh 99/08/28 01:05:46
Modified:src/lib/apr Makefile.in config.guess config.sub configure.in
src/lib/apr/file_io/os2 readwrite.c
src/lib/apr/network_io/os2 poll.c
src/lib/apr/threadproc/os2 proc.c
Log:
Fix build of APR on OS/2
Revision ChangesPath
1.5 +1 -1 apache-2.0/src/lib/apr/Makefile.in
Index: Makefile.in
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 1999/08/27 16:25:33 1.4
+++ Makefile.in 1999/08/28 08:05:42 1.5
@@ -41,7 +41,7 @@
all: Makefile $(MODULES) subdirs
rm -Rf libs
mkdir libs
- @for i in $(SUBDIRS); do cp $$i/lib*.a libs ; done;
+ @for i in $(SUBDIRS); do cp $$i/*.a libs ; done;
@echo APR built.
clean: subdirs_clean
1.2 +3 -0 apache-2.0/src/lib/apr/config.guess
Index: config.guess
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/config.guess,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.guess 1999/08/17 15:59:35 1.1
+++ config.guess 1999/08/28 08:05:43 1.2
@@ -938,6 +938,9 @@
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
+*:OS/2:*:*)
+ echo i386-pc-os2_emx
+ exit 0;;
esac
#echo '(No uname command or uname output not recognized.)' 12
1.2 +2 -0 apache-2.0/src/lib/apr/config.sub
Index: config.sub
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/config.sub,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config.sub1999/08/17 15:59:35 1.1
+++ config.sub1999/08/28 08:05:43 1.2
@@ -891,6 +891,8 @@
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
;;
+ -os2_emx)
+ ;;
# First accept the basic system types.
# The portable systems comes first.
# Each alternative MUST END IN A *, to match a version number.
1.4 +3 -0 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in 1999/08/19 13:31:09 1.3
+++ configure.in 1999/08/28 08:05:43 1.4
@@ -78,6 +78,9 @@
AC_CHECK_LIB(pthread, pthread_mutex_init, AC_DEFINE(USE_PTHREAD_SERIALIZE))
case $OS in
+ *-os2*)
+ OSDIR=os2
+ ;;
*beos*)
OSDIR=beos
;;
1.2 +1 -1 apache-2.0/src/lib/apr/file_io/os2/readwrite.c
Index: readwrite.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readwrite.c 1999/08/17 15:59:36 1.1
+++ readwrite.c 1999/08/28 08:05:44 1.2
@@ -60,7 +60,7 @@
#define INCL_DOS
#include os2.h
-ap_status_t ap_read(const struct file_t *thefile, void *buf, ap_ssize_t
*nbytes)
+ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
{
ULONG rc;
ULONG bytesread;
1.2 +1 -0 apache-2.0/src/lib/apr/network_io/os2/poll.c
Index: poll.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poll.c1999/08/17 15:59:43 1.1
+++ poll.c1999/08/28 08:05:45 1.2
@@ -58,6 +58,7 @@
#include apr_network_io.h
#include apr_general.h
#include apr_lib.h
+#include sys/time.h
/* OS/2 doesn't have a poll function, implement using select */
1.2 +1 -0 apache-2.0/src/lib/apr/threadproc/os2/proc.c
Index: proc.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- proc.c1999/08/17 15:59:50 1.1
+++ proc.c1999/08/28 08:05:45 1.2
@@ -64,6 +64,7 @@
#include string.h
#include sys/wait.h
#include unistd.h
+#include process.h
#define INCL_DOS
#include os2.h
cvs commit: apache-2.0/src/os/unix iol_socket.c
rse 99/08/28 05:22:12
Modified:src/main alloc.c buff.c http_connection.c http_main.c
http_protocol.c
src/os/unix iol_socket.c
Log:
Make ``configure --with-option=devel'' under
GCC 2.95.1 happy by avoiding various warnings...
Revision ChangesPath
1.7 +2 -0 apache-2.0/src/main/alloc.c
Index: alloc.c
===
RCS file: /home/cvs/apache-2.0/src/main/alloc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alloc.c 1999/08/27 22:57:05 1.6
+++ alloc.c 1999/08/28 12:22:09 1.7
@@ -201,7 +201,9 @@
static union block_hdr *block_freelist = NULL;
static ap_thread_mutex *alloc_mutex;
+#ifdef WIN32
static ap_thread_mutex *spawn_mutex; /* Added back in for WIN32... */
+#endif
#ifdef POOL_DEBUG
static char *known_stack_point;
1.3 +1 -1 apache-2.0/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buff.c1999/08/26 10:45:55 1.2
+++ buff.c1999/08/28 12:22:09 1.3
@@ -601,7 +601,7 @@
ap_assert(nbyte 0);
if (fb-outcnt) {
- vec[0].iov_base = fb-outbase;
+ vec[0].iov_base = (void *)fb-outbase;
vec[0].iov_len = fb-outcnt;
vec[1].iov_base = (void *)buf;
vec[1].iov_len = nbyte;
1.18 +1 -1 apache-2.0/src/main/http_connection.c
Index: http_connection.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_connection.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- http_connection.c 1999/08/13 06:57:40 1.17
+++ http_connection.c 1999/08/28 12:22:09 1.18
@@ -67,7 +67,7 @@
HOOK_STRUCT(
HOOK_LINK(pre_connection)
HOOK_LINK(process_connection)
-);
+)
IMPLEMENT_HOOK_VOID(pre_connection,(conn_rec *c),(c))
IMPLEMENT_HOOK_RUN_FIRST(int,process_connection,(conn_rec *c),(c),DECLINED)
1.4 +3 -1 apache-2.0/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- http_main.c 1999/08/27 22:57:07 1.3
+++ http_main.c 1999/08/28 12:22:10 1.4
@@ -233,6 +233,9 @@
}
pool *g_pHookPool;
+
+extern char *optarg;
+
#ifdef WIN32
__declspec(dllexport)
int apache_main(int argc, char *argv[])
@@ -251,7 +254,6 @@
pool *plog; /* Pool for error-logging files */
pool *ptemp; /* Pool for temporart config stuff */
pool *pcommands; /* Pool for -C and -c switches */
-extern char *optarg;
/* TODO: PATHSEPARATOR should be one of the os defines */
#define PATHSEPARATOR '/'
1.12 +1 -1 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- http_protocol.c 1999/08/27 22:18:48 1.11
+++ http_protocol.c 1999/08/28 12:22:10 1.12
@@ -80,7 +80,7 @@
HOOK_LINK(log_transaction)
HOOK_LINK(http_method)
HOOK_LINK(default_port)
-);
+)
#define SET_BYTES_SENT(r) \
do { if (r-sent_bodyct) \
1.4 +1 -0 apache-2.0/src/os/unix/iol_socket.c
Index: iol_socket.c
===
RCS file: /home/cvs/apache-2.0/src/os/unix/iol_socket.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iol_socket.c 1999/08/13 15:52:01 1.3
+++ iol_socket.c 1999/08/28 12:22:12 1.4
@@ -58,6 +58,7 @@
#include httpd.h
#include ap_iol.h
+#include iol_socket.h
#include errno.h
#include sys/types.h
cvs commit: apache-2.0/src/modules/mpm/dexter acceptlock.c dexter.c
rse 99/08/28 06:00:56 Modified:src/modules/mpm/dexter acceptlock.c dexter.c Log: get rid of two additional warnings Revision ChangesPath 1.3 +2 -0 apache-2.0/src/modules/mpm/dexter/acceptlock.c Index: acceptlock.c === RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/acceptlock.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- acceptlock.c 1999/08/28 12:37:58 1.2 +++ acceptlock.c 1999/08/28 13:00:55 1.3 @@ -82,7 +82,9 @@ /* TODO: all these calls have to be ap_ prefixed, right? */ /* Number of cross-process locks we're managing */ +#ifndef NO_SERIALIZED_ACCEPT static int lock_count; +#endif /* Filename prefix for locks */ char *ap_lock_fname; 1.33 +1 -0 apache-2.0/src/modules/mpm/dexter/dexter.c Index: dexter.c === RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- dexter.c 1999/08/28 12:37:58 1.32 +++ dexter.c 1999/08/28 13:00:55 1.33 @@ -69,6 +69,7 @@ #include ap_listen.h #include acceptlock.h #include mpm_default.h +#include dexter.h #include poll.h #include netinet/tcp.h
