cvs commit: apache-site related_projects.html
gstein 00/01/28 16:18:36 Modified:.related_projects.html Log: add mod_dav. Revision ChangesPath 1.45 +16 -1 apache-site/related_projects.html Index: related_projects.html === RCS file: /home/cvs/apache-site/related_projects.html,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- related_projects.html 2000/01/27 23:30:15 1.44 +++ related_projects.html 2000/01/29 00:18:34 1.45 @@ -35,6 +35,7 @@ LIA HREF=#quickrefApache Quick Reference Card/A LIA HREF=#webmonkeyWebmonkey XSSI Extensions/A LIA HREF=#kshIndexkshIndex fancy index utility/a +LIA HREF=#moddavWebDAV Protocol Extensions for Apache (mod_dav)/a /UL H3Commercial Products/H3 @@ -239,7 +240,21 @@ of URL's, files, and directories, user authorization management, cascading user customization, events calendars, contact lists, etc. -HR +PHR +H3A NAME=moddav HREF=http://www.webdav.org/mod_dav/; +WebDAV Protocol Extensions for Apache/A/H3 + +The a href=http://www.webdav.org/mod_dav/;mod_dav/a Apache +module adds a href=http://www.webdav.org/;WebDAV/a +capabilities to your Apache web server. +p + WebDAV stands for Web-Based Distributed Authoring and + Versioning. The WebDAV protocol is a set of extensions to HTTP + to allow remote users to collaboratively edit and manage files + on a web server. +/p + +PHR H3A NAME=apacheweekApache Week/A/H3 A free weekly guide to the latest Apache developments. Apache Week provides an easy way to stay abreast of the
cvs commit: apache-1.3/src/lib/expat-lite CHANGES
gstein 00/01/15 02:46:15 Modified:src/lib/expat-lite CHANGES Log: document our changes from the standard Expat distribution. Revision ChangesPath 1.2 +34 -10apache-1.3/src/lib/expat-lite/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/CHANGES,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CHANGES 1999/05/31 11:12:54 1.1 +++ CHANGES 2000/01/15 10:46:14 1.2 @@ -18,24 +18,48 @@ We also retain expat/expat.html for attribution to James Clark and licensing information. -In addition, we remove expat/xmltok/dllmain.c from our version since -we statically link expat-lite into the executable (rather than -building a DLL on the Win32 platform). The *.dsp files are also -removed, since we place those elsewhere in the Apache source -distribution and they will have a very different structure. +Note that Apache has replaced (with custom versions) the .dsp files +normally distributed with Expat. Other changes are detailed further +below. -Makefile.tmpl has been created from scratch to provide build -instructions to the Apache build system. +=== FILES ADDED === + This file (CHANGES) has been added to document changes from the original Expat distribution. +Makefile.tmpl has been created from scratch to provide build +instructions to the Apache build system. + +xmlparse.def and xmltok.def have been added. -=== CHANGES TO ORIGINAL === +.cvsignore has been added. + -There have been no changes made to any Expat file at this point in -time (May 31, 1999). +=== CHANGES TO ORIGINAL === The files, in their original state from the Expat distribution, have been tagged within CVS with the EXPAT_1_1 tag. That tag may be used as a reference for changes made by the Apache Group. + +The following changes have been made: + +June, 1999: + + - modified xmldef.h to define XML_BYTE_ORDER in terms of the +AP_BYTE_ORDER symbol. + - removed compilation warnings from: xmlparse.c, xmltok.c, xmltok.h, +xmltok_impl.c, xmltok_ns.c + +November, 1999: + + - xmlparse.{def,dsp,mak} and xmltok.{def,dsp,mak} were added. +NOTE: the .dsp files are different from the standard Expat + distribution. + - dllmain.c (from the Expat distribution) was added + +January, 2000: + + - Renamed lookup() in hashtable.[ch] to hashTableLookup() to prevent +possible conflicts with third-party libraries and modules. Updated +calls in xmlparse.c accordingly.
cvs commit: apache-1.3/src CHANGES
gstein 00/01/14 01:15:25 Modified:.STATUS src CHANGES Log: the wumpus approaches... Revision ChangesPath 1.792 +12 -12apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.791 retrieving revision 1.792 diff -u -r1.791 -r1.792 --- STATUS2000/01/13 13:19:44 1.791 +++ STATUS2000/01/14 09:15:16 1.792 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/13 13:19:44 $] + Last modified at [$Date: 2000/01/14 09:15:16 $] Release: @@ -50,7 +50,7 @@ The error message states this flag is required for long long types to be recognized by HPUX's compiler Ryan submitted a patch for this problem -STATUS: Ryan +1, Jim, +1 +STATUS: Ryan +1, Jim, +1, Greg +1 * DSO emulation for AIX 4.2 appears hosed. Sascha has submitted a patch which fixes the problems and addresses some concerns. @@ -58,12 +58,6 @@ Message-ID: [EMAIL PROTECTED] Status: Sascha +1, Jim +1 (untested), Ryan +1 (untested) -* Namespace collision is possible with the Expat library. J. - Clark is aware of this, but we should not wait for an official - patch. We should make our own. -Message-ID: [EMAIL PROTECTED] - Status: - RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP: * Cliff Woolley suggests the following patch to fix a problem @@ -170,6 +164,7 @@ Jim -1 (I really don't think it makes sense to add this right now this late in the release cycle for 1.3.10. I am +1 for 1.3.11) + Greg -0 for 1.3 series. * Brian Havard's patch to remove dependency of mod_auth_dbm on mod_auth. (PR#2598) @@ -193,6 +188,7 @@ Martin +1 (on concept, but patched apache does not compile successfully on pre-IPv6-SVR4, and possibly others), Jim -1 (not for 1.3.10) + Greg -0 for 1.3 series. * Jim Patterson's patch to make mod_info work on Win32 Message-ID: PR#1442 @@ -210,7 +206,8 @@ to mod_include's variable processing. Mesage-ID: PR#3246, also available at http://www.physics.mcgill.ca/~juan/mod_include.patch - Status: Ken -0 for 1.3/+0 for 2.0, Lars -0 for 1.3 + Status: Ken, Greg: -0 for 1.3/+0 for 2.0 + Lars -0 for 1.3 * Eric Prud'hommeaux's mod_dir mods for file-level access control. Message-ID: [EMAIL PROTECTED] @@ -226,7 +223,8 @@ * Greg's XML Handling patch Message-ID: [EMAIL PROTECTED] Message-ID: [EMAIL PROTECTED] -Status: Greg +1, Martin +1 (on concept) +Status: Greg -0 (will integrate into 2.0 rather than 1.3) + Martin +1 (on concept) In progress: @@ -324,12 +322,14 @@ * Paul would like to see a 'gdbm' option because he uses it a lot. -+1: Greg (volunteers), Martin + -0: Greg (volunteers; will add to 2.0 series rather than 1.3) ++1: Martin * Many people have asked for a DBM to be distributed with Apache to isolate it from platform inconsistencies. SDBM (used by mod_ssl, mod_dav, Perl, and others) should fit the bill and is public domain. -+1: Greg (volunteers), Martin + -0: Greg (volunteers; will add to 2.0 series rather than 1.3) ++1: Martin * Maybe a http_paths.h file? See [EMAIL PROTECTED] 1.1498+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1497 retrieving revision 1.1498 diff -u -r1.1497 -r1.1498 --- CHANGES 2000/01/12 15:54:51 1.1497 +++ CHANGES 2000/01/14 09:15:22 1.1498 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) rename the lookup() function to hashTableLookup() (in expat-lite) + to prevent name clashes with modules / third-party software. + [Ralf S. Engelschall, Greg Stein] + *) Reduce the time that a parent waits for its children to die after SIGKILL has been sent, since there isn't much point in waiting another 16 seconds beyond the initial SIGTERM waiting period.
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
gstein 99/11/26 11:31:23 Modified:src/modules/standard mod_rewrite.c Log: The floating point rounding performed by the ap_snprintf() was throwing off the distribution of the random value. The much simpler forms works just as well, and provides a normal distribution. Revision ChangesPath 1.151 +1 -9 apache-1.3/src/modules/standard/mod_rewrite.c Index: mod_rewrite.c === RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- mod_rewrite.c 1999/10/27 09:13:17 1.150 +++ mod_rewrite.c 1999/11/26 19:31:21 1.151 @@ -3047,16 +3047,8 @@ static int rewrite_rand(int l, int h) { -int i; -char buf[50]; - rewrite_rand_init(); -ap_snprintf(buf, sizeof(buf), %.0f, -(((double)(rand()%RAND_MAX)/RAND_MAX)*(h-l))); -i = atoi(buf)+1; -if (i l) i = l; -if (i h) i = h; -return i; +return rand() % (h - l + 1) + l; } static char *select_random_value_part(request_rec *r, char *value)
cvs commit: apache-1.3 STATUS
gstein 99/06/14 04:13:14 Modified:.STATUS Log: so these two toads were crossing the road... Revision ChangesPath 1.716 +7 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.715 retrieving revision 1.716 diff -u -r1.715 -r1.716 --- STATUS1999/06/13 19:59:34 1.715 +++ STATUS1999/06/14 11:13:13 1.716 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/06/13 19:59:34 $] + Last modified at [$Date: 1999/06/14 11:13:13 $] Release: @@ -168,6 +168,12 @@ * Ronald Tschalär's major update of mod_digest Message-ID: [EMAIL PROTECTED] Status: Big change -- needs review. + +* Greg's XML Handling patch +Message-ID: [EMAIL PROTECTED] +Message-ID: [EMAIL PROTECTED] +Status: Greg +1 + In progress:
cvs commit: apache-1.3/src/lib/expat-lite xmltok.h
gstein 99/06/03 03:35:27 Modified:src/lib/expat-lite xmltok.h Log: put the (void) in the existing prototype, rather than add a new one. (pointed out by James Clark) Revision ChangesPath 1.4 +1 -2 apache-1.3/src/lib/expat-lite/xmltok.h Index: xmltok.h === RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmltok.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmltok.h 1999/06/02 13:06:28 1.3 +++ xmltok.h 1999/06/03 10:35:27 1.4 @@ -275,9 +275,8 @@ const ENCODING XMLTOKAPI *XmlGetUtf16InternalEncoding(void); int XMLTOKAPI XmlUtf8Encode(int charNumber, char *buf); int XMLTOKAPI XmlUtf16Encode(int charNumber, unsigned short *buf); -int XmlSizeOfUnknownEncoding(void); -int XMLTOKAPI XmlSizeOfUnknownEncoding(); +int XMLTOKAPI XmlSizeOfUnknownEncoding(void); ENCODING XMLTOKAPI * XmlInitUnknownEncoding(void *mem, int *table,
cvs commit: apache-1.3/src/lib/expat-lite Makefile.tmpl asciitab.h expat.html hashtable.c hashtable.h iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h xmlparse.c xmlparse.h xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c
gstein 99/05/31 03:56:27 Added: src/lib/expat-lite Makefile.tmpl asciitab.h expat.html hashtable.c hashtable.h iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h xmlparse.c xmlparse.h xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c Log: This directory contains a subset of James Clark's Expat parser. It is covered under the MPL 1.1 license, which can be found at http://www.mozilla.org/MPL/. See the CHANGES file for any changes the Apache Group has made, if any. The original Expat can be found at http://www.jclark.com/xml/expat.html. Revision ChangesPath 1.1 apache-1.3/src/lib/expat-lite/Makefile.tmpl Index: Makefile.tmpl === # # default definition of these two. dunno how to get it prepended when the # Makefile is built, so we do it manually # CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS) INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) # If you know what your system's byte order is, define BYTE_ORDER: # use -DBYTE_ORDER=12 for little-endian byte order; # use -DBYTE_ORDER=21 for big-endian (network) byte order. #CFLAGS=-O2 OBJS=xmltok.o xmlrole.o xmlparse.o hashtable.o all lib: libexpat.a libexpat.a: $(OBJS) rm -f libexpat.a ar cr libexpat.a $(OBJS) $(RANLIB) libexpat.a clean: rm -f $(OBJS) libexpat.a distclean: clean -rm -f Makefile .SUFFIXES: .o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $ 1.1 apache-1.3/src/lib/expat-lite/asciitab.h Index: asciitab.h === /* The contents of this file are subject to the Mozilla Public License Version 1.1 (the License); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/MPL/ Software distributed under the License is distributed on an AS IS basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. The Original Code is expat. The Initial Developer of the Original Code is James Clark. Portions created by James Clark are Copyright (C) 1998, 1999 James Clark. All Rights Reserved. Contributor(s): Alternatively, the contents of this file may be used under the terms of the GNU General Public License (the GPL), in which case the provisions of the GPL are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the GPL and not to allow others to use your version of this file under the MPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the GPL. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the GPL. */ /* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, /* 0x04 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, /* 0x08 */ BT_NONXML, BT_S, BT_LF, BT_NONXML, /* 0x0C */ BT_NONXML, BT_CR, BT_NONXML, BT_NONXML, /* 0x10 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, /* 0x14 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, /* 0x18 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, /* 0x1C */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, /* 0x20 */ BT_S, BT_EXCL, BT_QUOT, BT_NUM, /* 0x24 */ BT_OTHER, BT_PERCNT, BT_AMP, BT_APOS, /* 0x28 */ BT_LPAR, BT_RPAR, BT_AST, BT_PLUS, /* 0x2C */ BT_COMMA, BT_MINUS, BT_NAME, BT_SOL, /* 0x30 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT, /* 0x34 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT, /* 0x38 */ BT_DIGIT, BT_DIGIT, BT_COLON, BT_SEMI, /* 0x3C */ BT_LT, BT_EQUALS, BT_GT, BT_QUEST, /* 0x40 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX, /* 0x44 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT, /* 0x48 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, /* 0x4C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, /* 0x50 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, /* 0x54 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, /* 0x58 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_LSQB, /* 0x5C */ BT_OTHER, BT_RSQB, BT_OTHER, BT_NMSTRT, /* 0x60 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX, /* 0x64 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT, /* 0x68 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, /* 0x6C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, /* 0x70 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, /* 0x74 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, /* 0x78 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER, /* 0x7C */ BT_VERBAR, BT_OTHER, BT_OTHER, BT_OTHER, 1.1 apache-1.3/src/lib/expat-lite/expat.html Index: expat.html
cvs commit: apache-1.3/src/lib/expat-lite CHANGES
gstein 99/05/31 04:12:55 Added: src/lib/expat-lite CHANGES Log: Document changes made by the Apache Group, along with details on Apache's particular subset of the full Expat 1.1 distribution. Revision ChangesPath 1.1 apache-1.3/src/lib/expat-lite/CHANGES Index: CHANGES === === PURPOSE === This file documents the changes made by the Apache Group to James Clark's Expat parser. The original Expat distribution can be found at http://www.jclark.com/xml/expat.html. === SUBSET INFORMATION === Apache does not choose (or need) to use the entire Expat parser distribution. The subset that Apache will use will be referred to as expat-lite. In particular, this directory contains the files from the following Expat distribution subdirectories: expat/xmltok/* expat/xmlparse/* We also retain expat/expat.html for attribution to James Clark and licensing information. In addition, we remove expat/xmltok/dllmain.c from our version since we statically link expat-lite into the executable (rather than building a DLL on the Win32 platform). The *.dsp files are also removed, since we place those elsewhere in the Apache source distribution and they will have a very different structure. Makefile.tmpl has been created from scratch to provide build instructions to the Apache build system. This file (CHANGES) has been added to document changes from the original Expat distribution. === CHANGES TO ORIGINAL === There have been no changes made to any Expat file at this point in time (May 31, 1999). The files, in their original state from the Expat distribution, have been tagged within CVS with the EXPAT_1_1 tag. That tag may be used as a reference for changes made by the Apache Group.
cvs commit: apache-1.3/src Configuration.tmpl Configure
gstein 99/05/31 04:57:59 Modified:src Configuration.tmpl Configure Log: The directory has changed to lib/expat-lite/ to clarify that we are not using the full Expat distribution (suggested by Roy). Revision ChangesPath 1.115 +3 -3 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- Configuration.tmpl1999/05/25 11:28:39 1.114 +++ Configuration.tmpl1999/05/31 11:57:57 1.115 @@ -162,9 +162,9 @@ # # EXPAT: # Include James Clark's Expat package into Apache, for use by the -# modules. The default is to include it if the lib/expat/ directory -# is present. This rule will always be interpreted as no if the -# directory is not present. +# modules. The default is to include it if the lib/expat-lite/ +# directory is present. This rule will always be interpreted as no +# if the directory is not present. # Rule SOCKS4=no 1.351 +4 -4 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.350 retrieving revision 1.351 diff -u -r1.350 -r1.351 --- Configure 1999/05/25 12:24:44 1.350 +++ Configure 1999/05/31 11:57:57 1.351 @@ -1569,7 +1569,7 @@ ## Add in the Expat library if needed/wanted. ## -if [ -d ./lib/expat/ ]; then +if [ -d ./lib/expat-lite/ ]; then if [ x$RULE_EXPAT = xdefault ]; then RULE_EXPAT=yes fi @@ -1582,9 +1582,9 @@ fi fi if [ x$RULE_EXPAT = xyes ]; then -EXPATLIB=lib/expat/libexpat.a -APLIBDIRS=expat $APLIBDIRS -CFLAGS=$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat +EXPATLIB=lib/expat-lite/libexpat.a +APLIBDIRS=expat-lite $APLIBDIRS +CFLAGS=$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite fi
cvs commit: apache-1.3/src/lib/expat - New directory
gstein 99/05/25 02:50:57 apache-1.3/src/lib/expat - New directory
cvs commit: apache-1.3/src/lib/expat MPL-1_0.html Makefile.tmpl asciitab.h expat.html gplelect.html hashtable.c hashtable.h iasciitab.h latin1tab.h nametab.h utf8tab.h xmlparse.c xmlparse.h xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h
gstein 99/05/25 03:03:39 Added: src/lib/expat MPL-1_0.html Makefile.tmpl asciitab.h expat.html gplelect.html hashtable.c hashtable.h iasciitab.h latin1tab.h nametab.h utf8tab.h xmlparse.c xmlparse.h xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h Log: Adding Expat 1.0.2 to the Apache repository. Apache elects to use the MPL license, per the instructions in expat.html. This version of Expat 1.0.2 has been modified to contain only the tokenizer and parser, and the Makefile has been adjusted to use Apache conventions (Makefile.tmpl). See http://www.jclark.com/xml/expat.html for more information on Expat. Revision ChangesPath 1.1 apache-1.3/src/lib/expat/MPL-1_0.html Index: MPL-1_0.html === TITLEMozilla Public License version 1.0/TITLE BODY BGCOLOR=#FF TEXT=#00 LINK=#EE VLINK=#551A8B ALINK=#FF P ALIGN=CENTER FONT SIZE=+2BMOZILLA PUBLIC LICENSE/B/FONTBR BVersion 1.0/B /P PHR WIDTH=20%P PB1. Definitions./B UL B1.1. ``Contributor''/B means each entity that creates or contributes to the creation of Modifications. PB1.2. ``Contributor Version''/B means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. PB1.3. ``Covered Code''/B means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereofB./B PB1.4. ``Electronic Distribution Mechanism''/B means a mechanism generally accepted in the software development community for the electronic transfer of data. PB1.5. ``Executable''/B means Covered Code in any form other than Source Code. PB1.6. ``Initial Developer''/B means the individual or entity identified as the Initial Developer in the Source Code notice required by BExhibit A/B. PB1.7. ``Larger Work''/B means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. PB1.8. ``License''/B means this document. PB1.9. ``Modifications''/B means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: UL PBA./B Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. PBB./B Any new file that contains any part of the Original Code or previous Modifications. /UL PB1.10. ``Original Code''/B means Source Code of computer software code which is described in the Source Code notice required by BExhibit A/B as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. PB1.11. ``Source Code''/B means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. PB1.12. ``You''/B means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. /UL B2. Source Code License./B UL B2.1. The Initial Developer Grant./B BRThe Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: UL PB(a)/B to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and PB(b)/B under patents now
cvs commit: apache-1.3/src/main http_main.c
gstein 99/05/25 03:15:07 Modified:src Configuration.tmpl Configure Makefile.tmpl src/main http_main.c Log: Add RULE_EXPAT. Add src/lib/ handling. Revision ChangesPath 1.113 +7 -0 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- Configuration.tmpl1998/12/01 23:59:53 1.112 +++ Configuration.tmpl1999/05/25 10:15:03 1.113 @@ -160,12 +160,19 @@ # is performing this function. If PARANOID is set to yes, it will # actually print-out the code that the modules execute # +# EXPAT: +# Include James Clark's Expat package into Apache, for use by the +# modules. The default is to include it if the ./expat/ directory +# is present. This rule will always be interpreted as no if the +# directory is not present. +# Rule SOCKS4=no Rule SOCKS5=no Rule IRIXNIS=no Rule IRIXN32=yes Rule PARANOID=no +Rule EXPAT=default # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for 1.349 +61 -3 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.348 retrieving revision 1.349 diff -u -r1.348 -r1.349 --- Configure 1999/05/23 16:55:28 1.348 +++ Configure 1999/05/25 10:15:04 1.349 @@ -77,7 +77,8 @@ tmpfile3=$tmpfile.3 awkfile=$tmpfile.4 tmpconfig=$tmpfile.5 -SUBDIRS=ap main modules +SUBDIRS=ap main +APLIBDIRS= ## Now handle any arguments, which, for now, is -file @@ -223,6 +224,7 @@ RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file` RULE_IRIXN32=`./helpers/CutRule IRIXN32 $file` RULE_PARANOID=`./helpers/CutRule PARANOID $file` +RULE_EXPAT=`./helpers/CutRule EXPAT $file` RULE_SHARED_CORE=`./helpers/CutRule SHARED_CORE $file` RULE_SHARED_CHAIN=`./helpers/CutRule SHARED_CHAIN $file` @@ -1565,6 +1567,27 @@ fi +## Add in the Expat library if needed/wanted. +## +if [ -d ./lib/expat/ ]; then +if [ $RULE_EXPAT = default ]; then +RULE_EXPAT=yes +fi +else +if [ $RULE_EXPAT = yes ]; then +echo ERROR: RULE_EXPAT set to \yes\ but is not available. + exit 1 +else +RULE_EXPAT=no +fi +fi +if [ $RULE_EXPAT = yes ]; then +EXPATLIB=lib/expat/libexpat.a +APLIBDIRS=expat $APLIBDIRS +CFLAGS=$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat +fi + + ## Now the SHARED_CHAIN stuff ## if [ x$using_shlib = x1 ] ; then @@ -1779,7 +1802,7 @@ ## Now add the target for the main Makefile ## -echo SUBDIRS=$SUBDIRS Makefile +echo SUBDIRS=$SUBDIRS lib modules Makefile echo SUBTARGET=$SUBTARGET Makefile echo SHLIB_SUFFIX_NAME=$SHLIB_SUFFIX_NAME Makefile echo SHLIB_SUFFIX_LIST=$SHLIB_SUFFIX_LIST Makefile @@ -1807,6 +1830,7 @@ echo LDFLAGS1=$LDFLAGS Makefile.config echo MFLAGS_STATIC=$MFLAGS_STATIC Makefile.config echo REGLIB=$REGLIB Makefile.config +echo EXPATLIB=$EXPATLIB Makefile.config echo RANLIB=$RANLIB Makefile.config @@ -1991,12 +2015,46 @@ sed -e s#@@Configuration@@#$file# Makefile.tmpl Makefile # xxx/Makefile -MAKEDIRS=support main ap regex $OSDIR +MAKEDIRS=support $SUBDIRS for dir in $MAKEDIRS ; do echo Creating Makefile in $dir ./helpers/mfhead $dir $file $dir/Makefile $CAT Makefile.config $dir/Makefile.tmpl |\ sed -e s:^SRCDIR=.*:SRCDIR=`./helpers/fp2rp $dir`: $dir/Makefile +done + + +## Now create the lib/Makefile +## +./helpers/mfhead modules $file lib/Makefile +$CAT Makefile.config | sed -e 's:^SRCDIR=.*:SRCDIR=..:' lib/Makefile + +$CAT EOF lib/Makefile +APLIBS=$APLIBDIRS +CFLAGS=\$(OPTIM) \$(CFLAGS1) \$(EXTRA_CFLAGS) + +default: all + +all clean distclean depend :: + @for i in \$(APLIBS) ; do \\ + if [ x\$\$i != x ]; then \\ + echo === \$(SDP)lib/\$\$i; \\ + (cd \$\$i \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\ + echo === \$(SDP)lib/\$\$i; \\ + fi; \\ + done + +EOF
cvs commit: apache-1.3/src CHANGES
gstein 99/05/25 03:23:17 Modified:.STATUS src CHANGES Log: Manoj would have a good comment for this, but I'm lame. Revision ChangesPath 1.692 +7 -13 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.691 retrieving revision 1.692 diff -u -r1.691 -r1.692 --- STATUS1999/05/21 11:05:08 1.691 +++ STATUS1999/05/25 10:23:14 1.692 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/05/21 11:05:08 $] + Last modified at [$Date: 1999/05/25 10:23:14 $] Release: @@ -170,18 +170,6 @@ via the Apache API with Perl and C. Status: http://www.pobox.com/~dougm/libapr-0.20_01.tar.gz -* Greg's [PATCH] Expat as an option -Message-ID: [EMAIL PROTECTED] -Status: one open(?) issue remains: there may be some extra work to -export the Expat functions from httpd on Win32 and AIX for -DSOs to use (requires changes to the .def and .exp files). -= Ralf: +1 for the patch in general - -1 until the symbol export issue is solved. -Hint: IMHO the only correct way is to encapsulate -the complete Expat API into with a ap_xml_xxx() -API. See also my EAPI patches where I've done this -for the MM API. - Needs patch: * MaxRequestsPerChild doesn't count requests, only the @@ -257,6 +245,12 @@ * Paul would like to see a 'gdbm' option because he uses it a lot. ++1: Greg (volunteers) + +* Many people have asked for a DBM to be distributed with Apache to + isolate it from platform inconsistencies. SDBM (used by mod_ssl, + mod_dav, Perl, and others) should fit the bill and is public domain. ++1: Greg (volunteers) * Maybe a http_paths.h file? See [EMAIL PROTECTED] 1.1362+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1361 retrieving revision 1.1362 diff -u -r1.1361 -r1.1362 --- CHANGES 1999/05/21 12:16:14 1.1361 +++ CHANGES 1999/05/25 10:23:15 1.1362 @@ -1,5 +1,8 @@ Changes with Apache 1.3.7 + *) Add RULE_EXPAT, the src/lib/ directory structure, and a modified copy + of the Expat 1.0.2 distribution. [Greg Stein] + *) Replace regexec() calls with calls to a new API stub function ap_regexec(). This solves problems with DSO modules which use the regex library. [Jens-Uwe Mager [EMAIL PROTECTED], Ralf S. Engelschall]
cvs commit: apache-1.3 STATUS
gstein 99/05/21 03:20:59 Modified:.STATUS Log: update Expat patch's Msg-ID and commentary. Revision ChangesPath 1.690 +5 -6 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.689 retrieving revision 1.690 diff -u -r1.689 -r1.690 --- STATUS1999/05/20 10:17:46 1.689 +++ STATUS1999/05/21 10:20:58 1.690 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/05/20 10:17:46 $] + Last modified at [$Date: 1999/05/21 10:20:58 $] Release: @@ -166,11 +166,10 @@ Status: http://www.pobox.com/~dougm/libapr-0.20_01.tar.gz * Greg's [PATCH] Expat as an option -Message-ID: [EMAIL PROTECTED] -Status: a few open issues remaining: 1) shift expat, regex, and -Ralf's MM stuff down to a new src/lib/ subdir. 2) exporting -Expat functions from httpd on Win32 and AIX for DSOs to use -(requires changes to the .def and .exp files). +Message-ID: [EMAIL PROTECTED] +Status: one open(?) issue remains: there may be some extra work to +export the Expat functions from httpd on Win32 and AIX for +DSOs to use (requires changes to the .def and .exp files). Needs patch:
cvs commit: apache-1.3 STATUS
gstein 99/04/17 01:43:27 Modified:.STATUS Log: add note about Expat patch. Revision ChangesPath 1.682 +8 -1 apache-1.3/STATUS Index: STATUS === RCS file: /home/cvs/apache-1.3/STATUS,v retrieving revision 1.681 retrieving revision 1.682 diff -u -r1.681 -r1.682 --- STATUS1999/03/30 06:18:58 1.681 +++ STATUS1999/04/17 08:43:26 1.682 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/30 06:18:58 $] + Last modified at [$Date: 1999/04/17 08:43:26 $] Release: @@ -162,6 +162,13 @@ This package contains modules for manipulating client request data via the Apache API with Perl and C. Status: http://www.pobox.com/~dougm/libapr-0.20_01.tar.gz + +* Greg's [PATCH] Expat as an option +Message-ID: [EMAIL PROTECTED] +Status: a few open issues remaining: 1) shift expat, regex, and +Ralf's MM stuff down to a new src/lib/ subdir. 2) exporting +Expat functions from httpd on Win32 and AIX for DSOs to use +(requires changes to the .def and .exp files). Needs patch: