cvs commit: apache-1.3/htdocs index.html.de
martin 99/08/18 04:35:34 Added: htdocs index.html.de Log: First cut at a german version. Lars, Ralf: please have a look at it fix it ;-) Revision ChangesPath 1.1 apache-1.3/htdocs/index.html.de Index: index.html.de === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTML HEAD TITLETestseite fuer die Apache-Installation auf dieser Web Site/TITLE !-- Translated Wed Aug 18 11:04:02 GMT 1999 - [EMAIL PROTECTED] -- /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF H1 ALIGN=CENTER Es klappt! Der Apache Web-Server ist auf dieser Web-Site installiert! /H1 P Wenn Sie diese Seite sehen, dann bedeutet das, dass die Eigentuuml;mer dieser Domauml;ne soeben einen neuen A HREF=http://www.apache.org/httpd;Apache Web-Server/A erfolgreich installiert haben. Jetzt muss noch der richtige Web-Inhalt zugefuuml;gt und diese Platzhalter-Seite ersetzt werden (oder der Web-Server fuuml;r den Zugriff auf den richtigen Inhalt umkonfiguriert werden). /P HR BLOCKQUOTE Wenn Sie diese Seite an Stelle einer anderen erwarteten Web-Site sehen sollten, dann STRONGnehmen Sie bitte Kontakt mit dem Eigentuuml;mer dieser Site auf/STRONG (Versuchen Sie, EMail an SAMPlt;Webmaster@EMdomauml;nenname/EMgt;/SAMP zu senden)!BR P Obwohl der Eigentuuml;mer dieser Domauml;ne die Apache Web-Server Software verwendet, hat diese Web-Site ziemlich sicher keinerlei Verbindung mit der EMApache Software Foundation/EM (die diese Software kostenlos vertreibt). Es besteht also BIGSTRONGkeinerlei Veranlassung/STRONG/BIG, eine EMail an die Entwickler der Software zu senden. Sollten Sie das dennoch tun, wird Ihre Mail stillschweigend STRONGBIGignoriert/BIG/STRONG. /BLOCKQUOTE HR P Die englische A HREF=manual/index.htmlOnline-Dokumentation/A fuuml;r die Apache Web-Server Software ist Bestandteil dieser Software-Distribution. /P P Dem IWebMaster/I dieser Web-Site steht es frei, das untenstehende Powered by Apache-Logo auf einem Apache-basierten Web-Server zu verwenden.BR Vielen Dank, dass Sie Apache gewauml;hlt haben! /P DIV ALIGN=CENTER IMG SRC=apache_pb.gif ALT=Powered by Apache! /DIV /BODY /HTML
cvs commit: apache-1.3/htdocs index.html.de
rse 99/08/18 05:00:58 Modified:htdocs index.html.de Log: adjustment Revision ChangesPath 1.2 +1 -1 apache-1.3/htdocs/index.html.de Index: index.html.de === RCS file: /home/cvs/apache-1.3/htdocs/index.html.de,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html.de 1999/08/18 11:35:34 1.1 +++ index.html.de 1999/08/18 12:00:56 1.2 @@ -28,7 +28,7 @@ BLOCKQUOTE Wenn Sie diese Seite an Stelle einer anderen erwarteten Web-Site sehen sollten, dann STRONGnehmen Sie bitte Kontakt mit dem - Eigentuuml;mer dieser Site auf/STRONG (Versuchen Sie, EMail + Eigentuuml;mer dieser Site auf/STRONG (Versuchen Sie, eine EMail an SAMPlt;Webmaster@EMdomauml;nenname/EMgt;/SAMP zu senden)!BR P
cvs commit: apache-2.0/mpm/src/lib/apr/time/unix Makefile.in
rbb 99/08/18 05:32:04 Modified:mpm/src/lib/apr/file_io/unix Makefile.in mpm/src/lib/apr/lib Makefile.in mpm/src/lib/apr/misc/unix Makefile.in mpm/src/lib/apr/network_io/unix Makefile.in mpm/src/lib/apr/threadproc/unix Makefile.in mpm/src/lib/apr/time/unix Makefile.in Removed: mpm/src/lib/apr config.status mpm/src/lib/apr/include apr_config.h Log: Basic cleanup for apr. This takes care of the make depend that used to be needed before APR would build. This also removes some files that never should have been imported. Revision ChangesPath 1.2 +6 -12 apache-2.0/mpm/src/lib/apr/file_io/unix/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/file_io/unix/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/08/17 15:59:36 1.1 +++ Makefile.in 1999/08/18 12:32:00 1.2 @@ -59,19 +59,16 @@ # DO NOT REMOVE dir.o: dir.c fileio.h ../../include/apr_general.h \ ../../include/apr_config.h ../../include/apr_errno.h \ - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \ - $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h \ + ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h \ ../../include/apr_portable.h ../../include/apr_thread_proc.h \ ../../include/apr_win.h ../../include/apr_network_io.h \ ../../include/apr_lock.h ../../include/apr_time.h fileacc.o: fileacc.c fileio.h ../../include/apr_general.h \ ../../include/apr_config.h ../../include/apr_errno.h \ - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \ - $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h + ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h filedup.o: filedup.c fileio.h ../../include/apr_general.h \ ../../include/apr_config.h ../../include/apr_errno.h \ - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \ - $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h + ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h filestat.o: filestat.c fileio.h ../../include/apr_general.h \ ../../include/apr_config.h ../../include/apr_errno.h \ ../../include/apr_file_io.h @@ -80,16 +77,13 @@ ../../include/apr_file_io.h ../../include/apr_portable.h \ ../../include/apr_thread_proc.h ../../include/apr_win.h \ ../../include/apr_network_io.h ../../include/apr_lock.h \ - ../../include/apr_time.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_config.h \ - $(INCDIR)/hsregex.h + ../../include/apr_time.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h pipe.o: pipe.c fileio.h ../../include/apr_general.h \ ../../include/apr_config.h ../../include/apr_errno.h \ - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \ - $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h + ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h readwrite.o: readwrite.c fileio.h ../../include/apr_general.h \ ../../include/apr_config.h ../../include/apr_errno.h \ - ../../include/apr_file_io.h $(INCDIR)/apr_lib.h \ - $(INCDIR)/apr_config.h $(INCDIR)/hsregex.h + ../../include/apr_file_io.h $(INCDIR)/apr_lib.h $(INCDIR)/hsregex.h seek.o: seek.c fileio.h ../../include/apr_general.h \ ../../include/apr_config.h ../../include/apr_errno.h \ ../../include/apr_file_io.h 1.2 +24 -24apache-2.0/mpm/src/lib/apr/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/lib/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/08/17 15:59:37 1.1 +++ Makefile.in 1999/08/18 12:32:01 1.2 @@ -61,29 +61,29 @@ rm Makefile.new # DO NOT REMOVE -apr_cpystrn.o: apr_cpystrn.c $(INCDIR)/apr_config.h -apr_execve.o: apr_execve.c $(INCDIR)/apr_config.h -apr_fnmatch.o: apr_fnmatch.c $(INCDIR)/apr_config.h $(INCDIR)/apr_fnmatch.h \ - $(INCDIR)/apr_lib.h ../include/apr_general.h ../include/apr_config.h \ +apr_cpystrn.o: apr_cpystrn.c ../include/apr_config.h +apr_execve.o: apr_execve.c ../include/apr_config.h +apr_fnmatch.o: apr_fnmatch.c ../include/apr_config.h \ + $(INCDIR)/apr_fnmatch.h $(INCDIR)/apr_lib.h ../include/apr_general.h \ ../include/apr_errno.h ../include/apr_file_io.h $(INCDIR)/hsregex.h -apr_getpass.o: apr_getpass.c $(INCDIR)/apr_config.h \ +apr_getpass.o: apr_getpass.c ../include/apr_config.h \ ../include/apr_errno.h $(INCDIR)/apr_lib.h ../include/apr_general.h \ - ../include/apr_config.h ../include/apr_file_io.h $(INCDIR)/hsregex.h -apr_md5.o: apr_md5.c $(INCDIR)/apr_config.h $(INCDIR)/apr_md5.h \ - $(INCDIR)/apr_lib.h ../include/apr_general.h ../include/apr_config.h \ - ../include/apr_errno.h ../include/apr_file_io.h
cvs commit: apache-2.0/mpm/src/lib/apr/network_io/unix networkio.h poll.c
rbb 99/08/18 06:33:29
Modified:mpm/src/lib/apr configure configure.in
mpm/src/lib/apr/file_io/unix open.c readwrite.c
mpm/src/lib/apr/include apr_config.h.in apr_file_io.h
mpm/src/lib/apr/lib apr_pools.c apr_tables.c
mpm/src/lib/apr/network_io/unix networkio.h poll.c
Log:
Cleanup some warnings on BSD. Also fixes the other two problems Ben found
last night. We only include poll if the system has it. And, a new #define,
APR_OS_DEFAULT, which makes open use the default permissions, instead of using
-1 with an unsigned number.
Revision ChangesPath
1.2 +378 -422 apache-2.0/mpm/src/lib/apr/configure
Index: configure
===
RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 1999/08/17 15:59:35 1.1
+++ configure 1999/08/18 13:33:22 1.2
@@ -10,7 +10,7 @@
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
+# Generated automatically using autoconf version 2.12
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -60,7 +60,6 @@
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Maximum number of lines to put in a shell here document.
ac_max_here_lines=12
@@ -344,7 +343,7 @@
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
-echo configure generated by autoconf version 2.13
+echo configure generated by autoconf version 2.12
exit 0 ;;
-with-* | --with-*)
@@ -514,11 +513,9 @@
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 15'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS 15'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS 15'
cross_compiling=$ac_cv_prog_cc_cross
-ac_exeext=
-ac_objext=o
if (echo testing\c; echo 1,2,3) | grep c /dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says [EMAIL PROTECTED]
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn /dev/null; then
@@ -548,16 +545,15 @@
# Extract the first word of gcc, so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n checking for $ac_word... $ac_c 16
-echo configure:552: checking for $ac_word 5
+echo configure:549: checking for $ac_word 5
if eval test \`echo '$''{'ac_cv_prog_CC'+set}'`\ = set; then
echo $ac_n (cached) $ac_c 16
else
if test -n $CC; then
ac_cv_prog_CC=$CC # Let the user override the test.
else
- IFS=${IFS=}; ac_save_ifs=$IFS; IFS=:
- ac_dummy=$PATH
- for ac_dir in $ac_dummy; do
+ IFS=${IFS=}; ac_save_ifs=$IFS; IFS=${IFS}:
+ for ac_dir in $PATH; do
test -z $ac_dir ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_CC=gcc
@@ -578,17 +574,16 @@
# Extract the first word of cc, so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n checking for $ac_word... $ac_c 16
-echo configure:582: checking for $ac_word 5
+echo configure:578: checking for $ac_word 5
if eval test \`echo '$''{'ac_cv_prog_CC'+set}'`\ = set; then
echo $ac_n (cached) $ac_c 16
else
if test -n $CC; then
ac_cv_prog_CC=$CC # Let the user override the test.
else
- IFS=${IFS=}; ac_save_ifs=$IFS; IFS=:
+ IFS=${IFS=}; ac_save_ifs=$IFS; IFS=${IFS}:
ac_prog_rejected=no
- ac_dummy=$PATH
- for ac_dir in $ac_dummy; do
+ for ac_dir in $PATH; do
test -z $ac_dir ac_dir=.
if test -f $ac_dir/$ac_word; then
if test $ac_dir/$ac_word = /usr/ucb/cc; then
@@ -623,61 +618,25 @@
echo $ac_tno 16
fi
- if test -z $CC; then
-case `uname -s` in
-*win32* | *WIN32*)
- # Extract the first word of cl, so it can be a program name with
args.
-set dummy cl; ac_word=$2
-echo $ac_n checking for $ac_word... $ac_c 16
-echo configure:633: checking for $ac_word 5
-if eval test \`echo '$''{'ac_cv_prog_CC'+set}'`\ = set; then
- echo $ac_n (cached) $ac_c 16
-else
- if test -n $CC; then
- ac_cv_prog_CC=$CC # Let the user override the test.
-else
- IFS=${IFS=}; ac_save_ifs=$IFS; IFS=:
- ac_dummy=$PATH
- for ac_dir in $ac_dummy; do
-test -z $ac_dir ac_dir=.
-if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC=cl
- break
-fi
- done
- IFS=$ac_save_ifs
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n $CC; then
- echo $ac_t$CC 16
-else
- echo $ac_tno 16
-fi
Re: DANISH and SWEDISH version of htdocs/index.html
On Wed, Aug 18, 1999 at 04:05:37PM +0200, Magnus Bodin wrote: CORRECTIONS TO THE DANISH ONE: == administrateren should read administratøren. inluderet should read inkluderet or even inkludert. Nope -- the administrator is administratoren in Danish -- administratøren is more Swedish than Danish (if anything). Anyway I've sent some more changes to directly Rasmus yesterday -- I hope that they'll appear in his mailbox and be handled. - Erik Bertelsen, UNI-C, Danmark.
cvs commit: apache-2.0/mpm/src/os/win32 iol_socket.h iol_socket.c
stoddard99/08/18 08:09:38
Modified:mpm/src/main buff.c
mpm/src/os/win32 iol_socket.c
Added: mpm/src/os/win32 iol_socket.h
Log:
WIN32: Emulate Unix writev.
Revision ChangesPath
1.9 +9 -2 apache-2.0/mpm/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/main/buff.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buff.c1999/08/06 00:54:29 1.8
+++ buff.c1999/08/18 15:09:36 1.9
@@ -63,9 +63,16 @@
#include stdio.h
#include stdarg.h
#include string.h
-#ifndef NO_WRITEV
#include sys/types.h
+
+/* This writev sillyness will go away with APR. */
+#ifndef NO_WRITEV
#include sys/uio.h
+#else
+#ifdef WIN32
+/* Include code to emulate writev on WIN32 */
+#include ../os/win32/iol_socket.h
+#endif
#endif
#ifdef HAVE_BSTRING_H
@@ -193,7 +200,7 @@
{
switch (optname) {
case BO_BYTECT:
- fb-bytes_sent = *(const long int *) optval - (long int) fb-outcnt;;
+ fb-bytes_sent = *(const long int *) optval - (long int) fb-outcnt;
return 0;
case BO_TIMEOUT:
1.2 +97 -6 apache-2.0/mpm/src/os/win32/iol_socket.c
Index: iol_socket.c
===
RCS file: /home/cvs/apache-2.0/mpm/src/os/win32/iol_socket.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iol_socket.c 1999/08/17 21:25:31 1.1
+++ iol_socket.c 1999/08/18 15:09:37 1.2
@@ -58,10 +58,11 @@
#include httpd.h
#include ap_iol.h
+#include iol_socket.h
#define FD_NONBLOCKING_SET (1)
//#define IOL_SOCK_POSIX// This works except for writev
-#define IOL_SOCK_WIN32 // ANd this seems to be working as well, except
for writev...
+#define IOL_SOCK_WIN32
//#define IOL_SOCK_ASYNC
typedef struct {
@@ -197,6 +198,15 @@
method(recv, (ap_iol *viol, char *arg1, int arg2), recv, fdset, NULL)
+static const ap_iol_methods socket_methods = {
+win32_close,
+win32_send,
+//win32_writev,
+win32_recv,
+win32_setopt,
+win32_getopt
+};
+
#elif defined(IOL_SOCK_WIN32)
static int win32_send(ap_iol *viol, const char *buf, int len)
@@ -207,7 +217,7 @@
WSABUF wsaData;
wsaData.len = len;
-wsaData.buf = buf;
+wsaData.buf = (const char*) buf;
if (set_nonblock(iol-fd)) {
return -1;
@@ -324,6 +334,86 @@
return len;
}
+static int win32_writev(ap_iol *viol, const struct iovec *vec, int num)
+{
+int i;
+int rv;
+int lasterror;
+int len = 0;
+LPWSABUF pWsaData = malloc(sizeof(WSABUF) * num);
+
+iol_socket *iol = (iol_socket *)viol;
+
+if (!pWsaData)
+return -1;
+
+for (i = 0; i num; i++) {
+pWsaData[i].buf = vec[i].iov_base;
+pWsaData[i].len = vec[i].iov_len;
+}
+
+if (set_nonblock(iol-fd)) {
+free(pWsaData);
+return -1;
+}
+
+do {
+rv = WSASend(iol-fd, pWsaData, num, len, 0, NULL, NULL);
+if (rv == SOCKET_ERROR) {
+lasterror = WSAGetLastError();
+}
+} while (rv == SOCKET_ERROR lasterror == WSAEINTR);
+
+if (rv == SOCKET_ERROR lasterror == WSAEWOULDBLOCK iol-timeout
0) {
+struct timeval tv;
+fd_set fdset;
+int srv;
+
+do {
+FD_ZERO(fdset);
+FD_SET(iol-fd, fdset);
+tv.tv_sec = iol-timeout;
+tv.tv_usec = 0;
+
+srv = select(FD_SETSIZE, NULL, fdset, NULL, tv);
+if (srv == SOCKET_ERROR) {
+lasterror = WSAGetLastError();
+}
+} while (srv == SOCKET_ERROR errno == WSAEINTR);
+
+if (srv == 0) {
+free(pWsaData);
+return -1;
+}
+if (srv 0) {
+free(pWsaData);
+return -1;
+}
+else {
+do {
+rv = WSASend(iol-fd, pWsaData, num, len, 0, NULL, NULL);
+if (rv == SOCKET_ERROR) {
+lasterror = WSAGetLastError();
+}
+} while (rv == SOCKET_ERROR lasterror == WSAEINTR);
+}
+}
+else if (rv == SOCKET_ERROR) {
+len = -1;
+}
+
+free(pWsaData);
+return len;
+}
+static const ap_iol_methods socket_methods = {
+win32_close,
+win32_send,
+win32_writev,
+win32_recv,
+win32_setopt,
+win32_getopt
+};
+
#elif defined(IOL_SOCK_ASYNC)
static int win32_read(ap_iol *viol, const char *buf, int bufSize)
@@ -354,9 +444,9 @@
NULL);
if (rc ==
cvs commit: apache-2.0/mpm/src/lib/apr/network_io/unix poll.c
ben 99/08/18 08:54:19
Modified:mpm/src/lib/apr config.status
mpm/src/lib/apr/include apr_config.h
mpm/src/lib/apr/network_io/unix poll.c
Log:
Use sys/time.h to get timeval. Correct typo.
Revision ChangesPath
1.3 +57 -95apache-2.0/mpm/src/lib/apr/Attic/config.status
1.3 +13 -10apache-2.0/mpm/src/lib/apr/include/Attic/apr_config.h
1.3 +6 -3 apache-2.0/mpm/src/lib/apr/network_io/unix/poll.c
Index: poll.c
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/lib/apr/network_io/unix/poll.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poll.c1999/08/18 13:33:28 1.2
+++ poll.c1999/08/18 15:54:18 1.3
@@ -60,6 +60,9 @@
#ifdef HAVE_ERRNO_H
#include errno.h
#endif
+#ifdef HAVE_SYS_TIME_H
+#include sys/time.h
+#endif
#ifdef HAVE_POLL/* We can just use poll to do our socket polling. */
@@ -396,13 +399,13 @@
ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset,
struct socket_t *sock, ap_int16_t events)
{
-if (event APR_POLLIN) {
+if (events APR_POLLIN) {
FD_CLR(sock-socketdes, aprset-read);
}
-if (event APR_POLLPRI) {
+if (events APR_POLLPRI) {
FD_CLR(sock-socketdes, aprset-read);
}
-if (event APR_POLLOUT) {
+if (events APR_POLLOUT) {
FD_CLR(sock-socketdes, aprset-write);
}
return APR_SUCCESS;
cvs commit: apache-1.3 STATUS
wsanchez99/08/18 10:22:33 Modified:.STATUS Log: go Revision ChangesPath 1.749 +2 -2 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.748 retrieving revision 1.749 diff -u -r1.748 -r1.749 --- STATUS1999/08/16 17:59:39 1.748 +++ STATUS1999/08/18 17:22:32 1.749 @@ -1,12 +1,12 @@ 1.3 STATUS: - Last modified at [$Date: 1999/08/16 17:59:39 $] + Last modified at [$Date: 1999/08/18 17:22:32 $] Release: 1.3.9-dev: COUNTDOWN restarted at 08/15 3:00pm PDT Tarball planned for Monday morning unless problems found. Votes for rolling: Ralf +1, Martin +1, Roy +1, Randy +1, - Jim +1 + Jim +1, Fred +1 1.3.8: Not released. 1.3.7: Not released.
cvs commit: apache-2.0/mpm/conf httpd.conf-dist-win
stoddard99/08/18 12:31:09 Modified:mpm/conf httpd.conf-dist-win Log: Qualify the root Directory block directive with the ServerRoot drive letter. Not doing this causes directory_walk to check for a root .htaccess file, even if .htaccess files are disabled. Revision ChangesPath 1.2 +1 -1 apache-2.0/mpm/conf/httpd.conf-dist-win Index: httpd.conf-dist-win === RCS file: /home/cvs/apache-2.0/mpm/conf/httpd.conf-dist-win,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- httpd.conf-dist-win 1999/06/18 18:39:16 1.1 +++ httpd.conf-dist-win 1999/08/18 19:31:04 1.2 @@ -246,7 +246,7 @@ # First, we configure the default to be a very restrictive set of # permissions. # -Directory / +Directory @@ServerRoot@@/ Options FollowSymLinks AllowOverride None /Directory
cvs commit: apache-2.0/mpm/src/lib/apr/include apr_pools.h
rbb 99/08/18 12:54:00 Removed: mpm/src/lib/apr/inc hsregex.h apr_lib.h apr_md5.h mpm/src/lib/apr/include apr_pools.h Log: Moving some files. apr_pools.h is an internal ONLY header, and the other three need to be exposed to the outside world. This change should allow things to compile cleanly on AIX.
cvs commit: apache-2.0/mpm/src/lib/apr/time/unix Makefile.in
rbb 99/08/18 13:20:30
Modified:mpm/src/lib/apr configure
mpm/src/lib/apr/file_io/unix Makefile.in
mpm/src/lib/apr/lib Makefile.in
mpm/src/lib/apr/misc/unix Makefile.in
mpm/src/lib/apr/network_io/unix Makefile.in
mpm/src/lib/apr/test Makefile.in logresolve.c rotatelogs.c
suexec.c
mpm/src/lib/apr/threadproc/unix Makefile.in
mpm/src/lib/apr/time/unix Makefile.in
Removed: mpm/src/lib/apr/test a.out ab client htdigest new server
testargs testfile testproc testsig testsock
testthread testtime
Log:
Run make depend after moving the four header files. Remove the test programs
from cvs. Fix some small problems in some of the test programs.
Revision ChangesPath
1.3 +426 -342 apache-2.0/mpm/src/lib/apr/configure
Index: configure
===
RCS file: /home/cvs/apache-2.0/mpm/src/lib/apr/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure 1999/08/18 13:33:22 1.2
+++ configure 1999/08/18 20:18:40 1.3
@@ -10,7 +10,7 @@
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12
+# Generated automatically using autoconf version 2.13
# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
@@ -60,6 +60,7 @@
# Initialize some other variables.
subdirs=
MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
# Maximum number of lines to put in a shell here document.
ac_max_here_lines=12
@@ -343,7 +344,7 @@
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
-echo configure generated by autoconf version 2.12
+echo configure generated by autoconf version 2.13
exit 0 ;;
-with-* | --with-*)
@@ -513,9 +514,11 @@
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 15'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext
$LIBS 15'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS 15'
cross_compiling=$ac_cv_prog_cc_cross
+ac_exeext=
+ac_objext=o
if (echo testing\c; echo 1,2,3) | grep c /dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says [EMAIL PROTECTED]
if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn /dev/null; then
@@ -545,15 +548,16 @@
# Extract the first word of gcc, so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n checking for $ac_word... $ac_c 16
-echo configure:549: checking for $ac_word 5
+echo configure:552: checking for $ac_word 5
if eval test \`echo '$''{'ac_cv_prog_CC'+set}'`\ = set; then
echo $ac_n (cached) $ac_c 16
else
if test -n $CC; then
ac_cv_prog_CC=$CC # Let the user override the test.
else
- IFS=${IFS=}; ac_save_ifs=$IFS; IFS=${IFS}:
- for ac_dir in $PATH; do
+ IFS=${IFS=}; ac_save_ifs=$IFS; IFS=:
+ ac_dummy=$PATH
+ for ac_dir in $ac_dummy; do
test -z $ac_dir ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_CC=gcc
@@ -574,16 +578,17 @@
# Extract the first word of cc, so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n checking for $ac_word... $ac_c 16
-echo configure:578: checking for $ac_word 5
+echo configure:582: checking for $ac_word 5
if eval test \`echo '$''{'ac_cv_prog_CC'+set}'`\ = set; then
echo $ac_n (cached) $ac_c 16
else
if test -n $CC; then
ac_cv_prog_CC=$CC # Let the user override the test.
else
- IFS=${IFS=}; ac_save_ifs=$IFS; IFS=${IFS}:
+ IFS=${IFS=}; ac_save_ifs=$IFS; IFS=:
ac_prog_rejected=no
- for ac_dir in $PATH; do
+ ac_dummy=$PATH
+ for ac_dir in $ac_dummy; do
test -z $ac_dir ac_dir=.
if test -f $ac_dir/$ac_word; then
if test $ac_dir/$ac_word = /usr/ucb/cc; then
@@ -618,25 +623,61 @@
echo $ac_tno 16
fi
+ if test -z $CC; then
+case `uname -s` in
+*win32* | *WIN32*)
+ # Extract the first word of cl, so it can be a program name with
args.
+set dummy cl; ac_word=$2
+echo $ac_n checking for $ac_word... $ac_c 16
+echo configure:633: checking for $ac_word 5
+if eval test \`echo '$''{'ac_cv_prog_CC'+set}'`\ = set; then
+ echo $ac_n (cached) $ac_c 16
+else
+ if test -n $CC; then
+ ac_cv_prog_CC=$CC # Let the user override the test.
+else
+ IFS=${IFS=}; ac_save_ifs=$IFS; IFS=:
+ ac_dummy=$PATH
+ for ac_dir in $ac_dummy; do
+test -z $ac_dir ac_dir=.
+if
cvs commit: apache-2.0/mpm/conf httpd.conf-dist-win
stoddard99/08/18 13:32:18 Modified:mpm/conf httpd.conf-dist-win Log: Roll back that last change. Didn't do what I wanted it to do. Revision ChangesPath 1.3 +1 -1 apache-2.0/mpm/conf/httpd.conf-dist-win Index: httpd.conf-dist-win === RCS file: /home/cvs/apache-2.0/mpm/conf/httpd.conf-dist-win,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- httpd.conf-dist-win 1999/08/18 19:31:04 1.2 +++ httpd.conf-dist-win 1999/08/18 20:32:17 1.3 @@ -246,7 +246,7 @@ # First, we configure the default to be a very restrictive set of # permissions. # -Directory @@ServerRoot@@/ +Directory / Options FollowSymLinks AllowOverride None /Directory
cvs commit: apache-2.0/mpm/src/lib/apr/lib apr_pools.c
rbb 99/08/18 13:33:30
Modified:mpm/src/lib/apr/include apr_config.h.in
mpm/src/lib/apr/lib apr_pools.c
Log:
Two more changes for AIX. One defines the __attributes__ directive for
non-gcc
compilers and remove a warning on picky compilers.
Revision ChangesPath
1.3 +23 -0 apache-2.0/mpm/src/lib/apr/include/apr_config.h.in
Index: apr_config.h.in
===
RCS file:
/export/home/cvs/apache-2.0/mpm/src/lib/apr/include/apr_config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_config.h.in 1999/08/18 13:33:26 1.2
+++ apr_config.h.in 1999/08/18 20:33:28 1.3
@@ -9,6 +9,29 @@
#undef _ALL_SOURCE
#endif
+/* So that we can use inline on some critical functions, and use
+ * GNUC attributes (such as to get -Wall warnings for printf-like
+ * functions). Only do this in gcc 2.7 or later ... it may work
+ * on earlier stuff, but why chance it.
+ *
+ * We've since discovered that the gcc shipped with NeXT systems
+ * as cc is completely broken. It claims to be __GNUC__ and so
+ * on, but it doesn't implement half of the things that __GNUC__
+ * means. In particular it's missing inline and the __attribute__
+ * stuff. So we hack around it. PR#1613. -djg
+ */
+#if !defined(__GNUC__) || __GNUC__ 2 || \
+(__GNUC__ == 2 __GNUC_MINOR__ 7) ||\
+defined(NEXT)
+#define ap_inline
+#define __attribute__(__x)
+#define ENUM_BITFIELD(e,n,w) signed int n : w
+#else
+#define ap_inline __inline__
+#define USE_GNU_INLINE
+#define ENUM_BITFIELD(e,n,w) e n : w
+#endif
+
/* Define to empty if the keyword does not work. */
#undef const
1.3 +0 -1 apache-2.0/mpm/src/lib/apr/lib/apr_pools.c
Index: apr_pools.c
===
RCS file: /export/home/cvs/apache-2.0/mpm/src/lib/apr/lib/apr_pools.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apr_pools.c 1999/08/18 13:33:27 1.2
+++ apr_pools.c 1999/08/18 20:33:29 1.3
@@ -1214,7 +1214,6 @@
* since fclose() would flush I/O buffers, which is extremely undesirable;
* we just close the descriptor.
*/
-/*
static void file_cleanup(void *fpv)
{
fclose((FILE *) fpv);
