date:19981020

cvs commit: apache-1.3/src Configure

1998-10-20 Thread jim

jim 98/10/19 16:58:28

  Modified:src  Configure
  Log:
  Some changes to conserve/maintain some coding consistancy. Always quote
  strings and use 'x' as first preference when performing empty string
  hack.
  
  Revision  ChangesPath
  1.300 +29 -29apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.299
  retrieving revision 1.300
  diff -u -r1.299 -r1.300
  --- Configure 1998/10/07 10:18:16 1.299
  +++ Configure 1998/10/19 23:58:26 1.300
  @@ -158,7 +158,7 @@
   using_shlib=`grep  '^SharedModule' $tmpfile /dev/null  echo 1`
   
   # But perhaps later via apxs when just mod_so is compiled in!
  -if [ .$using_shlib = . ]; then
  +if [ x$using_shlib = x ]; then
   using_shlib=`grep  '^AddModule modules/standard/mod_so.o' $tmpfile 
/dev/null  echo 1`
   fi
   
  @@ -811,12 +811,12 @@
   ## Now check how we can _directly_ run the C pre-processor
   ##
   TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'`
  -if [ .$TCPP != . ]; then
  +if [ x$TCPP != x ]; then
   CPP=`CC=$CC CPP=$TCPP ./helpers/findcpp.sh`
   else
   CPP=`CC=$CC ./helpers/findcpp.sh`
   fi
  -if [ .$TCPP = . ]; then
  +if [ x$TCPP = x ]; then
   echo CPP=$CPP  Makefile.config
   fi 
   echo  + setting C pre-processor to $CPP
  @@ -1110,9 +1110,9 @@
   break
   fi
   done
  -if [ .$PERL != . ]; then
  +if [ x$PERL != x ]; then
   #   cool, Perl is installed on this platform...
  -if [ .`$PERL -V:dlsrc 2/dev/null | grep dlopen` != . ]; 
then
  +if [ x`$PERL -V:dlsrc 2/dev/null | grep dlopen` != x ]; 
then
   #   ...and actually uses the dlopen-style interface,
   #   so we can guess the flags from its knowledge
   CFLAGS_SHLIB=`$PERL -V:cccdlflags | cut -d\' -f2`
  @@ -1144,8 +1144,8 @@
   ## the shared objects if SharedModule was used.
   ##
   if [ x$using_shlib = x1 ] ; then
  -if [ x$TCFLAGS_SHLIB  = x -a x$CFLAGS_SHLIB  = x  -a \
  - x$TLDFLAGS_SHLIB = x -a x$LDFLAGS_SHLIB = x ]; then
  +if [ x$TCFLAGS_SHLIB  = x -a x$CFLAGS_SHLIB  = x  -a \
  + x$TLDFLAGS_SHLIB = x -a x$LDFLAGS_SHLIB = x ]; then
   echo 
   echo ** FAILURE: Sorry, no shared object support available.
   echo ** Either compile all modules statically (use AddModule 
instead
  @@ -1232,8 +1232,8 @@
   
   ## OK, now handle RANLIB
   ##
  -if [ .$RANLIB = . ]; then
  -if [ .$TRANLIB != . ]; then
  +if [ x$RANLIB = x ]; then
  +if [ x$TRANLIB != x ]; then
   RANLIB=$TRANLIB
   else
   if ./helpers/PrintPath -s ranlib; then
  @@ -1278,7 +1278,7 @@
   CFLAGS=$CFLAGS -DSOCKS -DSOCKS4
   CFLAGS=$CFLAGS -Dconnect=Rconnect -Dselect=Rselect
   CFLAGS=$CFLAGS -Dgethostbyname=Rgethostbyname
  -if [ .`grep EXTRA_ Makefile | grep lsocks` = . ]; then
  +if [ x`grep EXTRA_ Makefile | grep lsocks` = x ]; then
LIBS=$LIBS -L/usr/local/lib -lsocks
   fi
   case $PLAT in
  @@ -1297,7 +1297,7 @@
   CFLAGS=$CFLAGS -DSOCKS -DSOCKS5
   CFLAGS=$CFLAGS -Dconnect=SOCKSconnect -Dselect=SOCKSselect
   CFLAGS=$CFLAGS -Dgethostbyname=SOCKSgethostbyname -Dclose=SOCKSclose
  -if [ .`grep EXTRA_ Makefile | grep lsocks5` = . ]; then
  +if [ x`grep EXTRA_ Makefile | grep lsocks5` = x ]; then
   LIBS=$LIBS -L/usr/local/lib -lsocks5
   fi
   case $PLAT in
  @@ -1404,9 +1404,9 @@
   
ext=`echo $modfile | sed 's/^.*\.//'`
modbase=`echo $modfile | sed 's/\.[^.]*$//'`
  - if [ x$ext = x$modfile ]; then ext=o; modbase=$modfile; 
modfile=$modbase.o; fi
  - if [ x$ext = x ] ; then ext=o; modbase=$modfile; fi
  - if [ x$ext = xc ] ; then ext=o; fi
  + if [ x$ext = x$modfile ]; then ext=o; modbase=$modfile; 
modfile=$modbase.o; fi
  + if [ x$ext = x ] ; then ext=o; modbase=$modfile; fi
  + if [ x$ext = xc ] ; then ext=o; fi
   
# modbase is the path+filename without extension, ext is the
# extension given, or if none, o
  @@ -1441,7 +1441,7 @@
. ./$tmpfile3
fi
rm -f $tmpfile2 $tmpfile3
  - if [ $ext != so ]; then
  + if [ $ext != so ]; then
ext=o
fi
fi
  @@ -1449,11 +1449,11 @@
modname=`echo $modbase | sed 's/^.*\///' | \
sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'`
fi
  - if [ $ext != so ]; then
  + if [ $ext != so ]; then
echo Module $modname $modbase.$ext $tmpfile
fi
#   optionally generate export file for some linkers 
  - if [ $ext = so -a

cvs commit: apache-1.3/src/main http_request.c

1998-10-20 Thread coar

coar98/10/20 10:42:45

  Modified:src/main http_request.c
  Log:
Use a common routine to check for absoluteness of a path; this
works for both Win32 and Unix and gets rid of #ifdefs.
  
  PR:   2976, 3074
  Submitted by: Ken Parzygnat [EMAIL PROTECTED]
  Reviewed by:  Ken Coar
  
  Revision  ChangesPath
  1.135 +1 -8  apache-1.3/src/main/http_request.c
  
  Index: http_request.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- http_request.c1998/10/15 07:58:24 1.134
  +++ http_request.c1998/10/20 17:42:43 1.135
  @@ -832,14 +832,7 @@
* file may not have a uri associated with it -djg
*/
   rnew-uri = INTERNALLY GENERATED file-relative req;
  -#ifdef WIN32
  -rnew-filename = ((new_file[0] == '/'
  -   || (ap_isalpha(new_file[0])
  -new_file[1] == ':'
  -new_file[2] == '/')) ?
  -#else
  -rnew-filename = ((new_file[0] == '/') ?
  -#endif
  +rnew-filename = ((ap_os_is_path_absolute(new_file)) ?
 ap_pstrdup(rnew-pool, new_file) :
 ap_make_full_path(rnew-pool, fdir, new_file));
   rnew-per_dir_config = r-server-lookup_defaults;

cvs commit: apache-1.3/src CHANGES

1998-10-20 Thread coar

coar98/10/20 10:45:01

  Modified:src  CHANGES
  Log:
Add Ken P's latest fix.
  
  Revision  ChangesPath
  1.1113+4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1112
  retrieving revision 1.1113
  diff -u -r1.1112 -r1.1113
  --- CHANGES   1998/10/19 05:43:33 1.1112
  +++ CHANGES   1998/10/20 17:44:58 1.1113
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.4
   
  +  *) Further simplify checking for absolute paths by replacing an
  + hard-coded syntax check with a call to a routine we already created to
  + do this.  [Ken Parzygnat [EMAIL PROTECTED]] PR#2976, 3074
  +
 *) Log an error if we encounter a malformed require directive 
in mod_auth if we know that we know that no other module can
deal with it.  [Marc Slemko]

cvs commit: apache-1.3 STATUS

1998-10-20 Thread coar

coar98/10/20 12:58:48

  Modified:.STATUS
  Log:
Add Ralf's vote on the One True Config File issue.
  
  Revision  ChangesPath
  1.518 +2 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.517
  retrieving revision 1.518
  diff -u -r1.517 -r1.518
  --- STATUS1998/10/19 20:53:03 1.517
  +++ STATUS1998/10/20 19:58:47 1.518
  @@ -1,4 +1,4 @@
  -Apache 1.3 STATUS:
  + 1.3 STATUS:
   
   Release:
   
  @@ -78,7 +78,7 @@
   * Ken's merge of the Three Config Files into one, with srm.conf and
 access.conf made into go see the One True Config File placeholders.
Message-ID: [EMAIL PROTECTED]
  - Status: Ben +1, Jim +1
  + Status: Ben +1, Jim +1, Ralf +1
   
   * Harrie Hazewinkel's PATCH scoreboard
 This is a patch that changes the 'vhost'-name (type char [32])

cvs commit: apache-1.3/src BUILD.NOTES

1998-10-20 Thread coar

coar98/10/20 14:48:55

  Modified:src  BUILD.NOTES
  Log:
Add a note about building on AIX with the known compiler bug.
  
  Submitted by: Shane Owenby [EMAIL PROTECTED]
  Reviewed by:  Ken Coar
  
  Revision  ChangesPath
  1.2   +13 -0 apache-1.3/src/BUILD.NOTES
  
  Index: BUILD.NOTES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/BUILD.NOTES,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BUILD.NOTES   1998/09/17 21:13:58 1.1
  +++ BUILD.NOTES   1998/10/20 21:48:54 1.2
  @@ -18,3 +18,16 @@
 Jim Jagielski ([EMAIL PROTECTED]) if you need a precompiled build for
 A/UX 3.1.x.
   
  +-
  +AIX:
  +-
  +  If compiling Apache on AIX (any version) using the xlC compiler version
  +  3.6.X and you receive an error such as:
  +
  +Expected /Directory but saw /Directory
  +
  +  then you have a encountered a bug in xlC.  This is a problem with the
  +  3.6.X versions of xlC, and is not a problem with the Apache code.
  +  A patch for this version is to be provided by IBM in the coming days.
  +  (Oct 98)  When this patch is made available the URL will be provided here.
  +  For a precompiled build please check: 
http://www.apache.org/dist/binaries/

cvs commit: apache-1.3/src Configure

cvs commit: apache-1.3/src/main http_request.c

cvs commit: apache-1.3/src CHANGES

cvs commit: apache-1.3 STATUS

cvs commit: apache-1.3/src BUILD.NOTES

5 matches

Site Navigation

Mail list logo

Footer information