You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Jim Jagielski <ji...@jaguNET.com> on 1997/09/09 11:08:50 UTC
[STATUS] 1.3b1 Tue Sep 9 04:39:22 EDT 1997
-----------------------------------------------
1.3b1 status as of Tue Sep 9 04:39:22 EDT 1997
-----------------------------------------------
The Schedule
============
o) We are currently in Feature Freeze
o) Release of 1.3b1 on 9/15/97
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) There is a standing -1 for a beta release from Alexei unless
the docs are updated. At the very least, a new feature
must be noted with a [Documentation to be written] note
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 (possible patch below)
The Code Changes
================
The Patches
===========
o) mod_speling:
- To be committed.
o) Dean says he should have his buffered logs patch done
for 1.3b1
o) Paul's OS abstraction
+1 Randy, Brian (at least ap_is_path)
0 Jim would like to wait for 2.0
o) Paul's Configure patch for BSD make (below)
+1 Paul, Jim
o) Dean's patch to reverse Ben's hack fix for WIN32 auth
(below)
+1 Dean, Ben, Jim
o) Jim's Configure patch. Possible fix for HP-UX (below)
+1 Jim
The Plan
========
Agenda for 1.3.b2
====================
o) Dean's scoreboard cleanups patch
o) Deans buffered logs patch (if not in 1.3b1)
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="
Re: [STATUS] 1.3b1 Tue Sep 9 04:39:22 EDT 1997
Posted by Ben Laurie <be...@algroup.co.uk>.
Jim Jagielski wrote:
> o) Most likely we'll be releasing a binary-only
> of Win port. Since the schedule has slipped,
> maybe this gives Ben more time??
Could be :-)
> o) Paul's OS abstraction
> +1 Randy, Brian (at least ap_is_path)
> 0 Jim would like to wait for 2.0
+1
> o) Dean's patch to reverse Ben's hack fix for WIN32 auth
> (below)
> +1 Dean, Ben, Jim
I want to use Paul's OS abstraction.
Cheers,
Ben.
--
Ben Laurie |Phone: +44 (181) 994 6435|Apache Group member
Freelance Consultant |Fax: +44 (181) 994 6472|http://www.apache.org
and Technical Director|Email: ben@algroup.co.uk |Apache-SSL author
A.L. Digital Ltd, |http://www.algroup.co.uk/Apache-SSL
London, England. |"Apache: TDG" http://www.ora.com/catalog/apache
Re: OS abstractions on Win32
Posted by Ben Laurie <be...@algroup.co.uk>.
Paul Sutton wrote:
> And an implementation of
> ap_is_path_absolute() to remove the #ifdef sections in http_request.c and
> mod_alias.c.
Grrr. That's os_is_path_absolute().
Cheers,
Ben.
--
Ben Laurie |Phone: +44 (181) 994 6435|Apache Group member
Freelance Consultant |Fax: +44 (181) 994 6472|http://www.apache.org
and Technical Director|Email: ben@algroup.co.uk |Apache-SSL author
A.L. Digital Ltd, |http://www.algroup.co.uk/Apache-SSL
London, England. |"Apache: TDG" http://www.ora.com/catalog/apache
OS abstractions on Win32
Posted by Paul Sutton <pa...@ukweb.com>.
On Tue, 9 Sep 1997, Jim Jagielski wrote:
> o) Paul's OS abstraction
> +1 Randy, Brian (at least ap_is_path)
> 0 Jim would like to wait for 2.0
I've already send a patch for Unix systems to do enable os abstraction and
inlines. It also needed doing for Win32. I've now done that, but the patch
is *very* large (since all MSVC's makefiles are dinosaur size).
Basically, the changes are:
a. Add ApacheOS makefile in os/win32 to build an ApacheOS.dll
b. As part of this makefile, copy file os.h to src/main
c. Move the #ifdef WIN32 stuff from main/conf.h into os/win32/os.h
(necessary since os.h needs to know things like the definition of
API_EXPORT)
d. Update ApacheCore's makefile to link against the ApacheOS import lib
e. Update makefile.nt to build ApacheOS and install ApacheOS.dll
With this change and the previous Unix patch we would have a consistent
way of extracting OS abstractions from the code in main and modules/* to
files, macros or inlines in os/*/os.{c,h}. And an implementation of
ap_is_path_absolute() to remove the #ifdef sections in http_request.c and
mod_alias.c.
//pcs