httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Roy Fielding <field...@hyperreal.org>
Subject cvs commit: apache/src CHANGES Configure conf.h http_main.c
Date Fri, 15 Aug 1997 17:29:54 GMT
fielding    97/08/15 10:29:53

  Modified:    src      Tag: APACHE_1_2_X CHANGES Configure conf.h
                        http_main.c
  Log:
  Improved support for ConvexOS 11.
  
  Submitted by: Jeff Venters <venters@phoenix.rsn.hp.com>
  Reviewed by: Roy Fielding, Ralf S. Engelschall
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.286.2.47 +2 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.46
  retrieving revision 1.286.2.47
  diff -u -r1.286.2.46 -r1.286.2.47
  --- CHANGES	1997/08/15 17:08:50	1.286.2.46
  +++ CHANGES	1997/08/15 17:29:47	1.286.2.47
  @@ -4,6 +4,8 @@
     *) Force proxy to always respond as HTTP/1.0, which it was failing to
        do for errors and cached responses.  [Roy Fielding]
   
  +  *) PORT: Improved support for ConvexOS 11.  [Jeff Venters]
  +
   Changes with Apache 1.2.2 [not released]
   
     *) Fixed another long-standing bug in sub_req_lookup_file where it would
  
  
  
  1.96.2.9  +2 -1      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.96.2.8
  retrieving revision 1.96.2.9
  diff -u -r1.96.2.8 -r1.96.2.9
  --- Configure	1997/07/03 05:59:43	1.96.2.8
  +++ Configure	1997/08/15 17:29:48	1.96.2.9
  @@ -469,7 +469,8 @@
   	;;
       *convex-v11*)
   	OS='CONVEXOS11'
  -	CFLAGS="$CFLAGS -DCONVEXOS11"
  +	CFLAGS="$CFLAGS -ext -DCONVEXOS11"
  +	OPTIM="-O1" # scalar optimization only
   	CC='cc'
   	DEF_WANTHSREGEX=yes
   	;;
  
  
  
  1.99.2.5  +7 -5      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.99.2.4
  retrieving revision 1.99.2.5
  diff -u -r1.99.2.4 -r1.99.2.5
  --- conf.h	1997/07/01 01:38:13	1.99.2.4
  +++ conf.h	1997/08/15 17:29:49	1.99.2.5
  @@ -295,10 +295,6 @@
   extern int strcasecmp(const char *,const char *);
   extern int strncasecmp(const char *,const char *,unsigned);
   
  -#elif defined(CONVEXOS)
  -#define HAVE_GMTOFF
  -#define NEED_STRDUP
  -
   #elif defined(AUX)
   /* These are to let -Wall compile more cleanly */
   extern int strcasecmp(const char *, const char *);
  @@ -491,6 +487,12 @@
   
   /* Convex OS v11 */
   #elif defined(CONVEXOS11)
  +#undef HAVE_GMTOFF
  +#undef NO_KILLPG
  +#undef NO_SETSID
  +#undef NEED_STRDUP
  +#define HAVE_MMAP
  +
   #define NO_TIMEZONE
   #include <stdio.h>
   #include <sys/types.h>
  @@ -551,7 +553,7 @@
   int ap_vsnprintf(char *buf, size_t len, const char *format, va_list ap);
   #endif
   
  -#if !defined(NEXT) && !defined(CONVEXOS)
  +#if !defined(NEXT)
   #include <dirent.h>
   #define DIR_TYPE dirent
   #else
  
  
  
  1.149.2.8 +19 -0     apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.149.2.7
  retrieving revision 1.149.2.8
  diff -u -r1.149.2.7 -r1.149.2.8
  --- http_main.c	1997/08/10 07:23:26	1.149.2.7
  +++ http_main.c	1997/08/15 17:29:50	1.149.2.8
  @@ -666,8 +666,27 @@
   
   #elif defined(MAP_ANON) || defined(MAP_FILE)
   /* BSD style */
  +#ifdef CONVEXOS11
  +    /*
  +     * 9-Aug-97 - Jeff Venters (venters@convex.hp.com)
  +     * ConvexOS maps address space as follows:
  +     *   0x00000000 - 0x7fffffff : Kernel
  +     *   0x80000000 - 0xffffffff : User
  +     * Start mmapped area 1GB above start of text.
  +     *
  +     * Also, the length requires a pointer as the actual length is
  +     * returned (rounded up to a page boundary).
  +     */
  +    {
  +	unsigned len = SCOREBOARD_SIZE;
  +	
  +	m = mmap((caddr_t)0xC0000000, &len,
  +		PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, NOFD, 0);
  +    }
  +#else
       m = mmap((caddr_t)0, SCOREBOARD_SIZE,
   	     PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0);
  +#endif
       if (m == (caddr_t)-1)
       {
   	perror("mmap");
  
  
  

Mime
View raw message