httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@imdb.com (Rob Hartill)
Subject Patch to make 1.2b3 compatible with Tenon's Machten 4.0.3 (fwd)
Date Fri, 27 Dec 1996 14:21:09 GMT

Do we accept patches from convicted criminals ?   ;-)

Acked.


----- Forwarded message from Randal Schwartz -----

Sender: merlyn@gadget.cscaper.com
To: apache-bugs@apache.org
Subject: Patch to make 1.2b3 compatible with Tenon's Machten 4.0.3
From: Randal Schwartz <merlyn@stonehenge.com>
Date: 27 Dec 1996 06:44:47 -0700


I've attached the patch to be applied in "src" that fixes Apache 1.2b3
so that it will compile "out of the box" on Tenon's Machten (4bsd
for Macintoshes and PowerMacs).  The patch has been tested rather heavily
on Machten 4.0.3 (for PPC), but has not been tested on Machten 2.3
(for 68K), although I don't see any reason why it shouldn't work there
as well, as it was based on the previous patches for Apache 1.1 which
*was* tested on both architectures.

Here's hoping you get it into the distribution so that I don't have
to patch 1.2b4 the same way. :-)

-- 
Name: Randal L. Schwartz / Stonehenge Consulting Services (503)777-0095
Keywords: Perl training, UNIX[tm] consulting, video production, skiing, flying
Email: <merlyn@stonehenge.com> Snail: (Call) PGP-Key: (finger merlyn@ora.com)
Web: <A HREF="http://www.stonehenge.com/merlyn/">My Home Page!</A>
Quote: "I'm telling you, if I could have five lines in my .sig, I would!" -- me
------- Start of forwarded message -------
Date: Thu, 26 Dec 1996 19:09:00 -0800 (PST)
Message-Id: <8cybekpxd7.fsf@gadget.cscaper.com>
Reply-To: machten@tenon.com
From: Randal Schwartz <merlyn@stonehenge.com>
To: merlyn@stonehenge.com
Subject: patches for Apache 1.2b2 or 1.2b3


I'm sending this off to the Apache folks (the website seems inaccessible
at the moment), so hopefully, you won't need this patch for 1.2b4.

This fixes the sources for M10 4.0.3 only... I'm not sure if it'll
work for 2.3.  Apply in the "src" subdirectory, then build as desired.
Resulting binary works just fine, and I compiled in practically
*everything*. I can't take much credit for the patch... It's based on
the stuff I found on the Tenon FTP site for apache 1.1.

Line numbers for 1.2b3.  1.2b2 is fuzzed a few lines, but it'll still
patch OK.

*** DIST/Configure	Thu Dec 26 13:10:59 1996
--- Configure	Thu Dec 26 13:12:25 1996
***************
*** 330,335 ****
--- 330,338 ----
  	CFLAGS="-DULTRIX"
  	DEF_WANTHSREGEX=yes
  	;;
+     *-powerpc-tenon-*)
+ 	LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
+ 	;;
      *) # default: Catch systems we don't know about
      	echo Sorry, but we cannot grok \"$PLAT\"
  	echo uname -m
*** DIST/conf.h	Thu Dec 26 13:14:02 1996
--- conf.h	Thu Dec 26 13:14:32 1996
***************
*** 400,405 ****
--- 400,421 ----
  #include <sys/time.h>     
  #define MAXSOCKETS 200
      
+ #elif defined(__MACHTEN__)
+ typedef int rlim_t;
+ #define JMP_BUF sigjmp_buf
+ #undef NO_KILLPG
+ #define NO_SETSID
+ #define HAS_GMTOFF
+ #ifndef __MACHTEN_PPC__
+ #ifndef __MACHTEN_68K__
+ #define __MACHTEN_68K__
+ #endif
+ #define FLOCK_SERIALIZED_ACCEPT
+ #define NO_USE_SIGACTION
+ #undef NEED_STRDUP
+ #else
+ #define FCNTL_SERIALIZED_ACCEPT
+ #endif
  
  /* Unknown system - Edit these to match */
  #else
*** DIST/http_main.c	Thu Dec 26 13:14:02 1996
--- http_main.c	Thu Dec 26 13:15:31 1996
***************
*** 182,188 ****
--- 182,192 ----
      {
      char lock_fname[30];
  
+ #ifdef __MACHTEN__
+     strcpy(lock_fname, "/var/tmp/htlock.XXXXXX");
+ #else
      strcpy(lock_fname, "/usr/tmp/htlock.XXXXXX");
+ #endif
      
      if (mktemp(lock_fname) == NULL || lock_fname[0] == '\0')
      {


-- 
Name: Randal L. Schwartz / Stonehenge Consulting Services (503)777-0095
Keywords: Perl training, UNIX[tm] consulting, video production, skiing, flying
Email: <merlyn@stonehenge.com> Snail: (Call) PGP-Key: (finger merlyn@ora.com)
Web: <A HREF="http://www.stonehenge.com/merlyn/">My Home Page!</A>
Quote: "I'm telling you, if I could have five lines in my .sig, I would!" -- me


------- End of forwarded message -------


Mime
View raw message