diff -Naur apache_2.0a2/10xpatchlevel-orig apache_2.0a2/10xpatchlevel --- apache_2.0a2/10xpatchlevel-orig +++ apache_2.0a2/10xpatchlevel Mon Apr 10 14:58:15 2000 @@ -0,0 +1,5 @@ +This file contains the patch level for the Accelerating Apache patches +available from + http://oss.sgi.com/projects/apache/ + +10xpatchlevel=2.0a2-0 diff -Naur apache_2.0a2/conf/httpd.conf-dist-orig apache_2.0a2/conf/httpd.conf-dist --- apache_2.0a2/conf/httpd.conf-dist-orig Fri Mar 17 02:40:19 2000 +++ apache_2.0a2/conf/httpd.conf-dist Mon Apr 10 14:55:38 2000 @@ -251,7 +251,7 @@ # don't use Group #-1 on these systems! # User nobody -Group #-1 +Group nobody # # ServerAdmin: Your address, where problems with the server should be diff -Naur apache_2.0a2/src/build/library.mk-orig apache_2.0a2/src/build/library.mk --- apache_2.0a2/src/build/library.mk-orig Thu Mar 30 23:02:31 2000 +++ apache_2.0a2/src/build/library.mk Mon Apr 10 14:56:47 2000 @@ -59,10 +59,10 @@ $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) -$(LTLIBRARY_SHARED_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) - @test -d $(phplibdir) || $(mkinstalldirs) $(phplibdir) - $(LINK) -avoid-version -module -rpath $(phplibdir) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_SHARED_LIBADD) - $(SHLIBTOOL) --mode=install install $@ $(phplibdir) +#$(LTLIBRARY_SHARED_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) +# @test -d $(phplibdir) || $(mkinstalldirs) $(phplibdir) +# $(LINK) -avoid-version -module -rpath $(phplibdir) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_SHARED_LIBADD) +# $(SHLIBTOOL) --mode=install install $@ $(phplibdir) shared: @if test '$(SHLIBTOOL)' != '$(LIBTOOL)'; then \ diff -Naur apache_2.0a2/src/lib/apr/locks/unix/crossproc.c-orig apache_2.0a2/src/lib/apr/locks/unix/crossproc.c --- apache_2.0a2/src/lib/apr/locks/unix/crossproc.c-orig Fri Mar 31 00:36:05 2000 +++ apache_2.0a2/src/lib/apr/locks/unix/crossproc.c Mon Apr 10 14:57:22 2000 @@ -169,7 +169,7 @@ new->interproc = (pthread_mutex_t *)mmap((caddr_t) 0, sizeof(pthread_mutex_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if (new->interproc = (pthread_mutex_t *) (caddr_t) -1) { + if (new->interproc == (pthread_mutex_t *) (caddr_t) -1) { return errno; } close(fd);