cvs commit: apache-1.3/src Configure
bjh 99/05/09 20:52:45 Modified:src Configure Log: Enable EXTRA_LIBS when linking OS/2 dlls Revision ChangesPath 1.343 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- Configure 1999/05/04 11:21:07 1.342 +++ Configure 1999/05/10 03:52:45 1.343 @@ -1179,7 +1179,7 @@ LD_SHLIB=$CC LD_SHCORE_DEF=ApacheCoreOS2.def LD_SHCORE_LIBS=$LIBS - LIBS_SHLIB='$(SRCDIR)/ApacheCoreOS2.a -lsocket -lbsd' + LIBS_SHLIB='$(SRCDIR)/ApacheCoreOS2.a -lsocket -lbsd $(EXTRA_LIBS)' SHARED_CORE_EP='' SHCORE_IMPLIB='ApacheCoreOS2.a' OS_MODULE_INCLUDE='Makefile.OS2'
cvs commit: apache-apr/apr/threadproc/unix Makefile proc.c threadproc.h
rbb 99/05/10 07:36:36 Modified:docs apr-function.txt fileio.txt impl.txt misc.txt networkio.txt threadproc.txt time.txt apr/file_io/beos dir.c fileacc.c filedup.c filestat.c open.c readwrite.c seek.c apr/file_io/os2 filedup.c filestat.c open.c readwrite.c seek.c apr/file_io/unix dir.c fileacc.c filedup.c fileio.h filestat.c open.c pipe.c readwrite.c seek.c apr/misc/unix start.c apr/network_io/beos select.c sendrecv.c sockets.c sockopt.c apr/network_io/unix networkio.h poll.c sendrecv.c sockets.c sockopt.c apr/test Makefile ab_apr.c client.c server.c testfile.c testproc.c testsock.c apr/threadproc/unix Makefile proc.c threadproc.h Log: This is a huge change. It chagnes all of the apr_ to ap_. It works fine on my system (test program included), but I will check it out after the commit to make sure it still works. Revision ChangesPath 1.7 +54 -54apache-apr/docs/apr-function.txt Index: apr-function.txt === RCS file: /home/cvs/apache-apr/docs/apr-function.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apr-function.txt 1999/02/16 13:11:00 1.6 +++ apr-function.txt 1999/05/10 14:36:17 1.7 @@ -31,7 +31,7 @@ - APR_MACROS_AND_MAYBE_CONSTANTS will have all letters capitalized, with underscore word separators. -- apr_variables_and_functions will have all letters in lower case with +- ap_variables_and_functions will have all letters in lower case with underscore word separators. - APRTypedefsAndStructsAndUnions will have the first letter of each word's first letter capitalized. @@ -107,7 +107,7 @@ * Note: We could also follow the ANSI C model, but this seems more appropriate. - APRStatus apr_open(char *, APRUInt32, APRFilePerms, APRFile) + APRStatus ap_open(char *, APRUInt32, APRFilePerms, APRFile) Open the specified file, and return a method for accessing that file. Arguments: arg 1) path name to the file to be opened. @@ -127,41 +127,41 @@ work, but it will support the set of Unix permissions at minimum. arg 4) The abstracted file descriptor for the file that was opened. - APRStatus apr_close(APRFile); + APRStatus ap_close(APRFile); Close the specified file descriptor Arguments: arg 1) file descriptor of file to be closed. - APRStatus apr_read(APRFile, void *, APRUInt64, APRUInt64 *) + APRStatus ap_read(APRFile, void *, APRUInt64, APRUInt64 *) Read n bytes from file and store in buffer. Arguments: arg 1) File descriptor to read from arg 2) buffer to store data in arg 3) number of bytes to read arg 4) pointer to number of bytes read. (returned by APR) - APRStatus apr_write(APRFile, void *, APRUInt64, APRUInt64 *) + APRStatus ap_write(APRFile, void *, APRUInt64, APRUInt64 *) Write n bytes of data from buffer to file Arguments: arg 1) File descriptor to write data to arg 2) buffer to read data from arg 3) number of bytes to write arg 4) pointer to number of bytes written. (returned by APR) - APRStatus apr_writev(APRFile, APRIOVec *, APRUInt64, APUInt64 *) - Same as apr_write, except it gets the data from the APRIOVec array. + APRStatus ap_writev(APRFile, APRIOVec *, APRUInt64, APUInt64 *) + Same as ap_write, except it gets the data from the APRIOVec array. Arguments: arg 1) File descriptor to write data to arg 2) Array from which to get the data to write to the file arg 3) Number of elements in the APRIOVec array. Must be smaller - than apr_MAX_IOVEC_SIZE, if not function will fail with - apr_BUFFER_OVERFLOW_ERROR + than ap_MAX_IOVEC_SIZE, if not function will fail with + ap_BUFFER_OVERFLOW_ERROR arg 4) number of bytes written. APR_FAILURE on failure. - NOTES: apr_writev will write a complete entry from APRIOVec array before + NOTES: ap_writev will write a complete entry from APRIOVec array before moving on to the next one. - APRStatus apr_getfileinfo(char *, APRFileInfo *) + APRStatus ap_getfileinfo(char *, APRFileInfo *) Get information about the file with the given path name. Arguments: arg 1) path to file to get information about arg 2) Structure to store file's information in. (Returned by APR) - APRStatus apr_seek(APRFile, APRInt64, APRSeekWhere, APRInt64 *) + APRStatus ap_seek(APRFile, APRInt64, APRSeekWhere, APRInt64 *) Moves
cvs commit: apache-apr/apr/threadproc/unix Makefile proc.c
rbb 99/05/10 08:29:41 Modified:apr/lib Makefile.in apr/threadproc/unix Makefile proc.c Log: Second part of the big commit to change from apr_ to ap_. I think this fixes the rest of the problems. Revision ChangesPath 1.6 +1 -1 apache-apr/apr/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.in 1999/04/28 19:20:15 1.5 +++ Makefile.in 1999/05/10 15:29:39 1.6 @@ -9,7 +9,7 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) INCDIR=../include -INCLUDES=-I$(INCDIR) +INCLUDES=-I../../include -I$(INCDIR) LIB=libapr.a 1.3 +1 -1 apache-apr/apr/threadproc/unix/Makefile Index: Makefile === RCS file: /home/cvs/apache-apr/apr/threadproc/unix/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile 1999/05/10 14:36:35 1.2 +++ Makefile 1999/05/10 15:29:40 1.3 @@ -47,7 +47,7 @@ LIB= libthreadproc.a -OBJS= proc.o thread.o threadcancel.o threadpriv.o +OBJS= proc.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $ 1.8 +1 -1 apache-apr/apr/threadproc/unix/proc.c Index: proc.c === RCS file: /home/cvs/apache-apr/apr/threadproc/unix/proc.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- proc.c1999/05/10 14:36:36 1.7 +++ proc.c1999/05/10 15:29:40 1.8 @@ -183,7 +183,7 @@ while (args[i]) { i++; } -newargs = (char **)apr_palloc(cont-pool, sizeof (char *) * (i + 3)); +newargs = (char **)ap_palloc(cont-pool, sizeof (char *) * (i + 3)); newargs[0] = strdup(SHELL_PATH); newargs[1] = strdup(-c); i = 0;
cvs commit: apache-apr/include apr_errno.h apr_file_io.h apr_general.h apr_network_io.h apr_thread_proc.h
rbb 99/05/10 09:58:19 Modified:include apr_errno.h apr_file_io.h apr_general.h apr_network_io.h apr_thread_proc.h Log: My cvs extract got messed up, so these changes weren't put in before. I'm going to check it again. Revision ChangesPath 1.7 +1 -1 apache-apr/include/apr_errno.h Index: apr_errno.h === RCS file: /home/cvs/apache-apr/include/apr_errno.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- apr_errno.h 1999/04/29 20:20:38 1.6 +++ apr_errno.h 1999/05/10 16:58:17 1.7 @@ -61,7 +61,7 @@ /* If this definition of APRStatus changes, then we can remove this, but right now, the decision was to use an errno-like implementation. */ -typedef int apr_status_t; +typedef int ap_status_t; #define APR_SUCCESS 1 #define APR_FAILURE -1 1.21 +30 -30apache-apr/include/apr_file_io.h Index: apr_file_io.h === RCS file: /home/cvs/apache-apr/include/apr_file_io.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- apr_file_io.h 1999/04/30 18:38:57 1.20 +++ apr_file_io.h 1999/05/10 16:58:17 1.21 @@ -67,7 +67,7 @@ #include apr_errno.h -/* Flags for apr_open */ +/* Flags for ap_open */ #define APR_READ 1 /* Open the file for reading */ #define APR_WRITE2 /* Open the file for writing */ #define APR_CREATE 4 /* Create the file if not there */ @@ -78,7 +78,7 @@ #define APR_EXCL 128 /* Open should fail if APR_CREATE and file exists. */ -/* flags for apr_seek */ +/* flags for ap_seek */ #define APR_SET SEEK_SET #define APR_CUR SEEK_CUR #define APR_END SEEK_END @@ -97,40 +97,40 @@ #define APR_WEXECUTE WEXECUTE /* should be same as whence type in lseek, POSIZ defines this as int */ -typedef apr_int32_t apr_seek_where_t; +typedef ap_int32_t ap_seek_where_t; -typedef struct file_t apr_file_t; -typedef struct dir_t apr_dir_t; -typedef fileperms_t apr_fileperms_t; -typedef dirent_t apr_dirent_t; -typedef iovec_t apr_iovec_t; +typedef struct file_t ap_file_t; +typedef struct dir_t ap_dir_t; +typedef fileperms_t ap_fileperms_t; +typedef dirent_t ap_dirent_t; +typedef iovec_t ap_iovec_t; /* Function definitions */ -apr_file_t *apr_open(apr_context_t *, char *, apr_int32_t, apr_fileperms_t); -apr_status_t apr_close(apr_context_t *, apr_file_t *); -apr_status_t apr_remove_file(apr_context_t *, char *); - -apr_ssize_t apr_read(apr_context_t *, apr_file_t *, void *, apr_ssize_t); -apr_ssize_t apr_write(apr_context_t *, apr_file_t *, void *, apr_ssize_t); -apr_ssize_t apr_writev(apr_context_t *, apr_file_t *, const apr_iovec_t *, apr_ssize_t); - -apr_file_t *apr_dupfile(apr_context_t *, apr_file_t *); -apr_status_t apr_getfileinfo(apr_context_t *, char *, apr_file_t *); -apr_status_t apr_updatefileinfo(apr_context_t *, apr_file_t *); -apr_off_t apr_seek(apr_context_t *, apr_file_t *, apr_off_t, apr_seek_where_t); - -apr_dir_t *apr_opendir(apr_context_t *, const char *); -apr_status_t apr_closedir(apr_context_t *, apr_dir_t *); -apr_dirent_t *apr_readdir(apr_context_t *, apr_dir_t *); -apr_status_t apr_rewinddir(apr_context_t *, apr_dir_t *); -apr_status_t apr_make_dir(apr_context_t *, const char *, apr_fileperms_t); -apr_status_t apr_remove_dir(apr_context_t *, const char *); +ap_file_t *ap_open(ap_context_t *, char *, ap_int32_t, ap_fileperms_t); +ap_status_t ap_close(ap_context_t *, ap_file_t *); +ap_status_t ap_remove_file(ap_context_t *, char *); + +ap_ssize_t ap_read(ap_context_t *, ap_file_t *, void *, ap_ssize_t); +ap_ssize_t ap_write(ap_context_t *, ap_file_t *, void *, ap_ssize_t); +ap_ssize_t ap_writev(ap_context_t *, ap_file_t *, const ap_iovec_t *, ap_ssize_t); + +ap_file_t *ap_dupfile(ap_context_t *, ap_file_t *); +ap_status_t ap_getfileinfo(ap_context_t *, char *, ap_file_t *); +ap_status_t ap_updatefileinfo(ap_context_t *, ap_file_t *); +ap_off_t ap_seek(ap_context_t *, ap_file_t *, ap_off_t, ap_seek_where_t); + +ap_dir_t *ap_opendir(ap_context_t *, const char *); +ap_status_t ap_closedir(ap_context_t *, ap_dir_t *); +ap_dirent_t *ap_readdir(ap_context_t *, ap_dir_t *); +ap_status_t ap_rewinddir(ap_context_t *, ap_dir_t *); +ap_status_t ap_make_dir(ap_context_t *, const char *, ap_fileperms_t); +ap_status_t ap_remove_dir(ap_context_t *, const char *); -apr_status_t apr_create_pipe(apr_context_t *, apr_file_t *, apr_file_t *); -char *apr_create_namedpipe(apr_context_t *, char *, apr_fileperms_t); +ap_status_t
cvs commit: apache-apr/apr/locks/unix Makefile crossproc.c intraproc.c locks.c locks.h
rbb 99/05/10 10:57:55 Added: apr/locks/unix Makefile crossproc.c intraproc.c locks.c locks.h Log: First pass at the locking stuff. Revision ChangesPath 1.1 apache-apr/apr/locks/unix/Makefile Index: Makefile === ## ## Apache Makefile, automatically generated by Configure script. ## Hand-edited changes will be lost if the Configure script is re-run. ## Sources: - ../Makefile.config (via Configuration.apaci) ## - ./Makefile.tmpl ## ## ## Inherited Makefile options from Configure script ## (Begin of automatically generated section) ## SRCDIR=.. EXTRA_CFLAGS=-g EXTRA_LDFLAGS= EXTRA_LIBS=-L ../../fileio -lfile EXTRA_INCLUDES= EXTRA_DEPS= OSDIR= INCDIR=../../../include INCLUDES0=-I . -I $(INCDIR) -I ../../file_io/unix SHELL=/bin/sh CC=gcc CPP=gcc -E TARGET= OPTIM= CFLAGS_SHLIB=-fpic -DSHARED_MODULE LD_SHLIB=ld LDFLAGS_SHLIB=-Bshareable LDFLAGS_SHLIB_EXPORT=-rdynamic CFLAGS1= -DLINUX=2 -pthread -DUSE_HSREGEX INCLUDES1= LIBS_SHLIB= LDFLAGS1= MFLAGS_STATIC=--no-print-directory REGLIB=regex/libregex.a RANLIB=ranlib LIBS1= -lm -lcrypt -lndbm -ldl ## ## (End of automatically generated section) ## CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) LIBS=$(EXTRA_LIBS) $(LIBS1) INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) LIB= libthreadproc.a OBJS= locks.o crossproc.o intraproc.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $ all: $(HEADERS) $(LIB) $(LIB): $(OBJS) rm -f $@ ar cr $@ $(OBJS) $(RANLIB) $@ cp $@ ../ clean: rm -f *.o $(LIB) distclean: clean -rm -f Makefile # We really don't expect end users to use this rule. It works only with # gcc, and rebuilds Makefile.tmpl. You have to re-run Configure after # using it. depend: cp Makefile.tmpl Makefile.tmpl.bak \ sed -ne '1,/^# DO NOT REMOVE/p' Makefile.tmpl Makefile.new \ gcc -MM $(INCLUDES) $(CFLAGS) *.c Makefile.new \ sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ Makefile.tmpl \ rm Makefile.new #Dependencies $(OBJS): Makefile # DO NOT REMOVE locks.o: locks.c crossproc.o: crossproc.c intraproc.o: intraproc.c 1.1 apache-apr/apr/locks/unix/crossproc.c Index: crossproc.c === /* * Copyright (c) 1999 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without *prior written permission. For written permission, please contact *[EMAIL PROTECTED] * * 5. Products derived from this software may not be called Apache *nor may Apache appear in their names without prior written *permission of the Apache Group. * * 6. Redistributions of any form whatsoever must retain the following *acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * STRICT LIABILITY, OR
cvs commit: apache-apr/apr/lib Makefile.in
rbb 99/05/10 13:11:40 Modified:apr Makefile.in configure.in apr/lib Makefile.in Log: You can now compile apr from the apr/directory. Next step is getting rest of apr using autoconf. Revision ChangesPath 1.3 +8 -3 apache-apr/apr/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/04/10 04:28:00 1.2 +++ Makefile.in 1999/05/10 20:11:38 1.3 @@ -10,17 +10,18 @@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) - [EMAIL PROTECTED]@ # # Macros for supporting directories # INCDIR=./include -INCLUDES=-I$(INCDIR) +INCDIR1=../include +INCLUDES=-I$(INCDIR) -I$(INCDIR1) # # Macros for target determination # -MODULES=lib/libapr.a +MODULES=lib SUBDIRS=lib # @@ -35,6 +36,10 @@ # all: Makefile $(MODULES) subdirs @echo APR built. + +lib: + cd lib \ + make clean: $(RM) -f *.o *.a *.so 1.6 +1 -0 apache-apr/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- configure.in 1999/04/14 11:06:24 1.5 +++ configure.in 1999/05/10 20:11:38 1.6 @@ -128,5 +128,6 @@ dnl Start building stuff from our information AC_SUBST(LDLIBS) AC_SUBST(OPTIM) +AC_SUBST(RANLIB) AC_SUBST(PLATFORM) AC_OUTPUT(Makefile lib/Makefile) 1.7 +2 -1 apache-apr/apr/lib/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.in 1999/05/10 15:29:39 1.6 +++ Makefile.in 1999/05/10 20:11:39 1.7 @@ -9,7 +9,8 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) INCDIR=../include -INCLUDES=-I../../include -I$(INCDIR) +INCDIR1=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR1) LIB=libapr.a
cvs commit: apache-site/info supportdb.txt
coar99/05/10 13:38:31 Modified:info supportdb.txt Log: Add another requested entry to the support list. Revision ChangesPath 1.16 +1 -0 apache-site/info/supportdb.txt Index: supportdb.txt === RCS file: /home/cvs/apache-site/info/supportdb.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- supportdb.txt 1999/05/10 18:55:20 1.15 +++ supportdb.txt 1999/05/10 20:38:30 1.16 @@ -1,4 +1,5 @@ # Type NameURL E-mail Phone Fax LocationComments +Comp Profissionais.net http://forums.programadores.com.br/apache [EMAIL PROTECTED] (055) 051 330 7460 Porto Alegre, Brazil A moderated mailing list (in Portuguese) for Brazilian users of Apache. Comp FREDNET Corporation http://www.frednet.com/ [EMAIL PROTECTED] +1 831 439 9500 +1 831 439 8502 Scotts Valley, CA, USA FREDNET sells Multi Level Secure Apache for Trusted Solaris and Trusted Irix within North America; and also provides commercial support, maintenance, and custom software development for Unix-based Apache Servers internationally. Cont Atanu M [EMAIL PROTECTED] +91-11-5033742 New Delhi, IndiaInstall, train, and maintain Apache Web servers on Linux and Windows NT Comp Cavern sc http://www.cavern.pl/ [EMAIL PROTECTED] +48 22 629 52 66+48 22 628 18 83Warszawa, PolandCavern provides commercial support for Apache, Apache with SSL Mod, Europe version of Strong SSL Applet, Linux, and other products.