cvs commit: apache-1.3 STATUS

[jim]

jim 00/01/14 10:47:56

  Modified:.STATUS
  Log:
  Almost there...
  
  Revision  ChangesPath
  1.793 +1 -22 apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.792
  retrieving revision 1.793
  diff -u -r1.792 -r1.793
  --- STATUS2000/01/14 09:15:16 1.792
  +++ STATUS2000/01/14 18:47:52 1.793
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 2000/01/14 09:15:16 $]
  +  Last modified at [$Date: 2000/01/14 18:47:52 $]
   
   Release:
   
  @@ -24,27 +24,6 @@
   2.0  : In pre-alpha development, see apache-2.0 repository
   
   RELEASE SHOWSTOPPERS:
  -
  -* HPUX binary build failure due to the fact that it is building
  -  libstandard.a and adding .so objects to the libstandard.a starting
  -  with mod_vhost_alias.so.
  -Message-ID: <[EMAIL PROTECTED]>
  - Status: Randy committed a temporary fix
  - UPDATE: Keith Wannamaker reports that Ralf's patch to
  - fix PR4974 has broken this again. Please see:
  -   <[EMAIL PROTECTED]>
  - UPDATE: Ryan suggested that SHLIB_SUFFIX_NAME=sl be backed
  -  out. Jim has done this. However, there is still debate
  -  on the correct fix. At present, this seems to fix the
  -  symptom, but not the full problem, which is inherent
  -  in how the shared "functionality" was coded. Other
  -  suggested patches break other platforms. So it
  -  is entirely possible that this fix is the one we
  -  will ship with.
  -UPDATE: Brian posted a patch which implements SHMOD_SUFFIX_NAME.
  - This has been reported to work on OS/2 and HPUX.
  - <[EMAIL PROTECTED]>
  - Ryan +1
   
   * HPUX build failure without -Ae provided to HPUX compiler as a CFLAG.
 The error message states this flag is required for "long long" types
  
  
  

cvs commit: apache-2.0/src/lib/apr/include apr_iconv.h

[rbb]

rbb 00/01/14 10:24:04

  Added:   src/lib/apr/include apr_iconv.h
  Log:
  Initial pass at codepage conversion routines.
  
  Revision  ChangesPath
  1.1  apache-2.0/src/lib/apr/include/apr_iconv.h
  
  Index: apr_iconv.h
  ===
  /* 
   * 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 TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see .
   *
   */
  
  #ifndef APR_ICONV_H
  #define APR_ICONV_H
  
  #include "apr_general.h"
  #include "apr_time.h"
  #include "apr_errno.h"
  
  #ifdef __cplusplus
  extern "C" {
  #endif /* __cplusplus */
  
  #if !defined(ICONV_IMPLEMENT)
  
  typedef void ap_iconv_t;
  
  /* For platforms where we don't bother with translating between codepages
   */
  
  #define ap_codepage_open(convset, topage, frompage, context) 
  #define ap_translate_codepage(convset, inbuf, inbytes_left, outbuf, \
outbytes_left) outbuf=inbuf;
  /* The purpose of ap_translate char is to translate one character
   * at a time.  This needs to be written carefully so that it works
   * with double-byte character sets. 
   */
  #define ap_translate_char(convset, inchar, outchar) outchar = inchar
  #define ap_codepage_close(convset)
  
  #else
  
  typedef struct ap_iconv_tap_iconv_t;
  
  void ap_codepage_open(ap_iconv_t **convset, const char *topage, 
   const char *frompage, ap_context_t *context); 
  void ap_translate_codepage(ap_iconv_t *convset, const char *inbuf, 
ap_size_t inbytes_left, const char *outbuf,
ap_size_t outbytes_left);
  /* The purpose of ap_translate char is to translate one character
   * at a time.  This needs to be written carefully so that it works
   * with double-byte character sets. 
   */
  void ap_translate_char(ap_iconv_t *convset, char inchar, char outchar);
  void ap_codepage_close(ap_iconv_t *convset)
  #endif
  
  #ifdef __cplusplus
  }
  #endif
  
  #endif  /* ! APR_ICONV_H */
  
  
  
  
  

cvs commit: apache-1.3/src Configure

[bjh]

bjh 00/01/14 08:10:36

  Modified:src  Configure
  Log:
  Allow different file name extensions for the shared core and shared modules.
  Set HPUX to use .sl for the core & .so for modules.
  Set OS/2 to use .dll for both.
  Reviewed by:  Ryan Bloom
  
  Revision  ChangesPath
  1.387 +8 -5  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.386
  retrieving revision 1.387
  diff -u -r1.386 -r1.387
  --- Configure 2000/01/10 23:53:08 1.386
  +++ Configure 2000/01/14 16:10:34 1.387
  @@ -1002,6 +1002,7 @@
   DEF_SHARED_CORE=no
   DEF_SHARED_CHAIN=no
   SHLIB_SUFFIX_NAME=so
  +SHMOD_SUFFIX_NAME=so
   SHLIB_SUFFIX_DEPTH=all
   SHLIB_EXPORT_FILES=no
   SHARED_CORE_EP='lib$(TARGET).ep'
  @@ -1244,7 +1245,7 @@
LDFLAGS_SHLIB="-b"
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT="-Wl,-E -Wl,-B,deferred"
  -#SHLIB_SUFFIX_NAME=sl
  + SHLIB_SUFFIX_NAME=sl
;;
*-hp-hpux10.*|*-hp-hpux11.*)
case $CC in
  @@ -1254,7 +1255,7 @@
LDFLAGS_SHLIB="-b"
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
LDFLAGS_SHLIB_EXPORT="-Wl,-E -Wl,-B,deferred -Wl,+s"
  -#SHLIB_SUFFIX_NAME=sl
  + SHLIB_SUFFIX_NAME=sl
;;
*-ibm-aix*)
case $CC in
  @@ -1288,6 +1289,7 @@
LDFLAGS_SHLIB="`echo $LDFLAGS|sed -e s/-Zexe//` -Zdll"
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
SHLIB_SUFFIX_NAME=dll
  + SHMOD_SUFFIX_NAME=dll
SHLIB_SUFFIX_DEPTH=0
LD_SHLIB=$CC
LD_SHCORE_DEF="ApacheCoreOS2.def"
  @@ -1689,7 +1691,7 @@
modlibs="$modlibs $modlibs1"
fi
rm -f $tmpfile2 $tmpfile3
  - if [ "x$ext" != "x$SHLIB_SUFFIX_NAME" ]; then
  + if [ "x$ext" != "x$SHMOD_SUFFIX_NAME" ]; then
ext=o
fi
fi
  @@ -1697,11 +1699,11 @@
modname=`echo $modbase | sed 's/^.*\///' | \
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi
  - if [ "x$ext" != "x$SHLIB_SUFFIX_NAME" ]; then
  + if [ "x$ext" != "x$SHMOD_SUFFIX_NAME" ]; then
echo "Module $modname $modbase.$ext" >>$tmpfile
fi
#   optionally generate export file for some linkers 
  - if [ "x$ext" = "x$SHLIB_SUFFIX_NAME" -a "x$SHLIB_EXPORT_FILES" = "xyes" 
]; then
  + if [ "x$ext" = "x$SHMOD_SUFFIX_NAME" -a "x$SHLIB_EXPORT_FILES" = "xyes" 
]; then
echo "$modname" >$modbase.exp
fi
   done
  @@ -1959,6 +1961,7 @@
   echo "SUBDIRS=$SUBDIRS lib modules" >> Makefile
   echo "SUBTARGET=$SUBTARGET" >> Makefile
   echo "SHLIB_SUFFIX_NAME=$SHLIB_SUFFIX_NAME" >> Makefile
  +echo "SHMOD_SUFFIX_NAME=$SHMOD_SUFFIX_NAME" >> Makefile
   echo "SHLIB_SUFFIX_LIST=$SHLIB_SUFFIX_LIST" >> Makefile
   echo "SHLIB_EXPORT_FILES=$SHLIB_EXPORT_FILES" >> Makefile
   echo "" >> Makefile
  
  
  

cvs commit: apache-site httpd.html

[coar]

coar00/01/14 03:46:20

  Modified:.httpd.html
  Log:
The Big Bad Day is passed..
  
  Revision  ChangesPath
  1.83  +0 -2  apache-site/httpd.html
  
  Index: httpd.html
  ===
  RCS file: /home/cvs/apache-site/httpd.html,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- httpd.html1999/09/11 01:54:43 1.82
  +++ httpd.html2000/01/14 11:46:20 1.83
  @@ -20,8 +20,6 @@
   http://www.apache.org/dyn/closer.cgi";>
   Mirrored worldwide - find your closest mirror
   
  -Apache's Y2K Readiness Statement
   
   
   
  
  
  

cvs commit: apache-1.3/src CHANGES

[gstein]

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
   
  - 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/lib/expat-lite hashtable.c hashtable.h xmlparse.c

[gstein]

gstein  00/01/14 01:03:50

  Modified:src/lib/expat-lite hashtable.c hashtable.h xmlparse.c
  Log:
  rename the lookup() function to hashTableLookup() to avoid possible
  name clashes (since the function is exported from the httpd executable).
  
  Revision  ChangesPath
  1.2   +1 -1  apache-1.3/src/lib/expat-lite/hashtable.c
  
  Index: hashtable.c
  ===
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/hashtable.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hashtable.c   1999/05/31 10:56:24 1.1
  +++ hashtable.c   2000/01/14 09:03:48 1.2
  @@ -58,7 +58,7 @@
 return h;
   }
   
  -NAMED *lookup(HASH_TABLE *table, KEY name, size_t createSize)
  +NAMED *hashTableLookup(HASH_TABLE *table, KEY name, size_t createSize)
   {
 size_t i;
 if (table->size == 0) {
  
  
  
  1.2   +1 -1  apache-1.3/src/lib/expat-lite/hashtable.h
  
  Index: hashtable.h
  ===
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/hashtable.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hashtable.h   1999/05/31 10:56:25 1.1
  +++ hashtable.h   2000/01/14 09:03:48 1.2
  @@ -56,7 +56,7 @@
 size_t usedLim;
   } HASH_TABLE;
   
  -NAMED *lookup(HASH_TABLE *table, KEY name, size_t createSize);
  +NAMED *hashTableLookup(HASH_TABLE *table, KEY name, size_t createSize);
   void hashTableInit(HASH_TABLE *);
   void hashTableDestroy(HASH_TABLE *);
   
  
  
  
  1.3   +20 -20apache-1.3/src/lib/expat-lite/xmlparse.c
  
  Index: xmlparse.c
  ===
  RCS file: /home/cvs/apache-1.3/src/lib/expat-lite/xmlparse.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xmlparse.c1999/06/02 07:15:03 1.2
  +++ xmlparse.c2000/01/14 09:03:49 1.3
  @@ -1132,7 +1132,7 @@
next - enc->minBytesPerChar);
if (!name)
  return XML_ERROR_NO_MEMORY;
  - entity = (ENTITY *)lookup(&dtd.generalEntities, name, 0);
  + entity = (ENTITY *)hashTableLookup(&dtd.generalEntities, name, 0);
poolDiscard(&dtd.pool);
if (!entity) {
  if (dtd.complete || dtd.standalone)
  @@ -1496,12 +1496,12 @@
 const XML_Char *localPart;
   
 if (tagNamePtr) {
  -elementType = (ELEMENT_TYPE *)lookup(&dtd.elementTypes, tagNamePtr->str, 
0);
  +elementType = (ELEMENT_TYPE *)hashTableLookup(&dtd.elementTypes, 
tagNamePtr->str, 0);
   if (!elementType) {
 tagNamePtr->str = poolCopyString(&dtd.pool, tagNamePtr->str);
 if (!tagNamePtr->str)
return XML_ERROR_NO_MEMORY;
  -  elementType = (ELEMENT_TYPE *)lookup(&dtd.elementTypes, 
tagNamePtr->str, sizeof(ELEMENT_TYPE));
  +  elementType = (ELEMENT_TYPE *)hashTableLookup(&dtd.elementTypes, 
tagNamePtr->str, sizeof(ELEMENT_TYPE));
 if (!elementType)
   return XML_ERROR_NO_MEMORY;
 if (ns && !setElementTypePrefix(parser, elementType))
  @@ -1613,7 +1613,7 @@
 if (appAtts[i][-1] == 2) {
   ATTRIBUTE_ID *id;
   ((XML_Char *)(appAtts[i]))[-1] = 0;
  - id = (ATTRIBUTE_ID *)lookup(&dtd.attributeIds, appAtts[i], 0);
  + id = (ATTRIBUTE_ID *)hashTableLookup(&dtd.attributeIds, appAtts[i], 0);
if (id->prefix->binding) {
  int j;
  const BINDING *b = id->prefix->binding;
  @@ -2037,7 +2037,7 @@
const XML_Char *name = poolStoreString(&dtd.pool, encoding, s, next);
if (!name)
  return XML_ERROR_NO_MEMORY;
  - declElementType = (ELEMENT_TYPE *)lookup(&dtd.elementTypes, name, 
sizeof(ELEMENT_TYPE));
  + declElementType = (ELEMENT_TYPE *)hashTableLookup(&dtd.elementTypes, 
name, sizeof(ELEMENT_TYPE));
if (!declElementType)
  return XML_ERROR_NO_MEMORY;
if (declElementType->name != name)
  @@ -2129,7 +2129,7 @@
if (!name)
  return XML_ERROR_NO_MEMORY;
if (dtd.complete) {
  -   declEntity = (ENTITY *)lookup(&dtd.generalEntities, name, 
sizeof(ENTITY));
  +   declEntity = (ENTITY *)hashTableLookup(&dtd.generalEntities, name, 
sizeof(ENTITY));
  if (!declEntity)
return XML_ERROR_NO_MEMORY;
  if (declEntity->name != name) {
  @@ -2439,7 +2439,7 @@
   next - enc->minBytesPerChar);
if (!name)
  return XML_ERROR_NO_MEMORY;
  - entity = (ENTITY *)lookup(&dtd.generalEntities, name, 0);
  + entity = (ENTITY *)hashTableLookup(&dtd.generalEntities, name, 0);
poolDiscard(&temp2Pool);
if (!entity) {
  if (dtd.complete) {
  @@ -2696,7 +2696,7 @@
 }
 if (!poolAppendChar(&dtd.pool, XML_T('\0')))
return 0;
  -  prefix = (PREFIX *)lookup(&dtd.prefixes, poolStart(&dtd.pool),