httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@jaguNET.com>
Subject [STATUS] 1.3b1 Wed Sep 10 15:40:38 EDT 1997
Date Wed, 10 Sep 1997 19:41:16 GMT

-----------------------------------------------
1.3b1 status as of Wed Sep 10 15:40:38 EDT 1997
-----------------------------------------------

The Schedule
============

   o) We are currently in Feature Freeze
   
   o) Release of 1.3b1 on 9/15/97, iff the Nt/Win stuff
      is ready for prime-time. If not, then the schedule
      will slip for that.
   
   o) We will be releasing the apachen CVS tree code
   
   o) Will we run the code thru indent first??
   
   o) Most likely we'll be releasing a binary-only
      of Win port. Since the schedule has slipped,
      maybe this gives Ben more time??

Open Items
==========

   o) It appears that FLOCK mutex doesn't work under some
      systems (eg: FreeBSD)!!
      
   o) We need to fix windows.html right now

   o) Configure dies on HP-UX (Weird... only one reported case
      and it _works_ when run as root)

The Code Changes
================

The Patches
===========

   o) mod_speling:
       - To be committed.
       
   o) Dean's buffered log feature - Need votes
      
   o) Paul's Configure patch for BSD make (below)
       - to be committed
       
   o) Dean's patch to reverse Ben's hack fix for WIN32 auth
      (below)
       +1 Dean, Ben, Jim

The Plan
========

Who knows... Hopefully we release 1.3.0 asap and start work
on 2.0, using 1.3.1 for bug-fixes. If history is any indication,
something will come up that "requires" 1.4. It's hoped that
this can be avoided and instead we'll use our energies to
focus on 2.0.


Agenda for 1.3.b2
====================

   o) Dean's scoreboard cleanups patch
   
   o) InstallShield stuff

START OF PATCHES
================

----------------------
Paul's Configure patch
----------------------

Index: Configure
===================================================================
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.150
diff -u -r1.150 Configure
--- Configure	1997/09/07 00:34:03	1.150
+++ Configure	1997/09/08 10:18:08
@@ -999,35 +997,16 @@
 echo "INCLUDES2=$INCLUDES2">> modules/Makefile
 echo "MOD_CFLAGS=\$(INCLUDES2) \$(AUX_CFLAGS)">> modules/Makefile
 
-CLEANERS=""
-for i in $MODDIRS ; do
-	CLEANERS="$CLEANERS${i}_clean "
-done
-
 cat << EOF >> modules/Makefile
 MODULES=$MODDIRS
-CLEANERS=$CLEANERS
-
-default: \$(MODULES)
-	@echo "Done building module subdirectories"
 
-clean: \$(CLEANERS)
-	@echo "Done cleaning module subdirectories"
-
-\$(MODULES): ForceMe
-	(cd \$@; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')
-
-ForceMe:
+all clean :: 
+	for i in \$(MODULES); do \\
+	 (cd \$\$i; \\
+	  \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)' \$@);\\
+	done
 
 EOF
-
-(
-for i in $MODDIRS ; do
-	echo "${i}_clean:"
-	echo "	(cd ${i}; \$(MAKE) clean)"
-	echo ""
-done
-) >> modules/Makefile
 
 for moddir in $AUTODIRS ; do
 	echo "Creating Makefile in $moddir"

------------------------
Dean's reverse Ben patch
------------------------
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.118
diff -u -r1.118 http_core.c
--- http_core.c	1997/09/02 16:12:08	1.118
+++ http_core.c	1997/09/06 01:10:26
@@ -267,8 +267,14 @@
  * See directory_walk().
  */
 
+#if defined(__EMX__) || defined(WIN32)
+#define IS_SPECIAL(entry_core)	\
+    ((entry_core)->r != NULL \
+	|| ((entry_core)->d[0] != '/' && (entry_core)->d[1] != ':'))
+#else
 #define IS_SPECIAL(entry_core)	\
     ((entry_core)->r != NULL || (entry_core)->d[0] != '/')
+#endif
 
 /* We need to do a stable sort, qsort isn't stable.  So to make it stable
  * we'll be maintaining the original index into the list, and using it
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_request.c,v
retrieving revision 1.81
diff -u -r1.81 http_request.c
--- http_request.c	1997/08/31 21:28:53	1.81
+++ http_request.c	1997/09/06 01:10:26
@@ -383,10 +383,11 @@
 	    entry_dir = entry_core->d;
 
 	    if (entry_core->r
-/* FIXME: Temporarily removed, pending an explanation of function, in order to
-          fix Win32 [Ben]
+#if defined(__EMX__) || defined(WIN32)
+		|| (entry_core[0] != '/' && entry_core[1] != ':')
+#else
 		|| entry_dir[0] != '/'
-*/
+#endif
 		|| entry_core->d_components > i) break;
 
 	    this_conf = NULL;


---------------------------
Jim's HP-UX Configure patch
---------------------------

Index: apachen/src/Configure
===================================================================
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.150
diff -u -r1.150 Configure
--- Configure	1997/09/07 00:34:03	1.150
+++ Configure	1997/09/09 09:08:17
@@ -354,7 +354,7 @@
 	DEF_WANTHSREGEX=no
 	;;
     *-solaris2*)
-    	SOLVER=`echo $PLAT | sed -e 's/^.*solaris2.//'`
+    	SOLVER=`echo $PLAT | sed 's/^.*solaris2.//'`
 	OS="Solaris $SOLVER"
 	CFLAGS="$CFLAGS -DSOLARIS2=$SOLVER"
 	LIBS="$LIBS -lsocket -lnsl"
@@ -818,7 +818,7 @@
 
 # create modules.c
 
-sed -e 's/_module//' $tmpfile | awk >modules.c '
+sed 's/_module//' $tmpfile | awk >modules.c '
     BEGIN {
 	modules[n++] = "core"
 	pmodules[pn++] = "core"
@@ -1033,7 +1033,7 @@
 	echo "Creating Makefile in $moddir"
 
 	cat Makefile.config > $moddir/Makefile
-	basedir=`echo $moddir | sed 's|^[^/]*/||g'`
+	basedir=`echo $moddir | sed 's/^[^/]*\///g'`
 	awk >> $moddir/Makefile < $tmpfile '
 	    BEGIN {
 		printf "OBJS="

-- 
====================================================================
      Jim Jagielski            |       jaguNET Access Services
     jim@jaguNET.com           |       http://www.jaguNET.com/
            "Look at me! I'm wearing a cardboard belt!"

Mime
View raw message