httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Giovanni Maruzzelli <mar...@matrice.it>
Subject Apache1.2b10 on NT [PATCHES]
Date Sat, 10 May 1997 03:15:12 GMT
Hi,


this is the diff against the standard 1.2b10 dist.
You can get the gnu-win32 tools from:
ftp://ftp.cygnus.com/pub/gnu-win32/latest/

w

====================================================

diff -cr apache_1.2b10/src/Configure apache_1.2b10_nt/src/Configure
*** apache_1.2b10/src/Configure	Sun Apr 27 09:52:17 1997
--- apache_1.2b10_nt/src/Configure	Fri May 09 18:41:23 1997
***************
*** 417,422 ****
--- 417,427 ----
  	OS='Paragon OSF/1'
  	CFLAGS="$CFLAGS -DPARAGON"
  	;;
+     *-CYGWIN32/NT*)
+ 	DEF_WANTHSREGEX=yes
+ 	OS='Cygwin32'
+ 	CFLAGS="$CFLAGS -DCYGWIN32"
+ 	;;
      *) # default: Catch systems we don't know about
      	echo Sorry, but we cannot grok \"$PLAT\"
  	echo uname -m
diff -cr apache_1.2b10/src/alloc.c apache_1.2b10_nt/src/alloc.c
*** apache_1.2b10/src/alloc.c	Fri Apr 25 01:35:19 1997
--- apache_1.2b10_nt/src/alloc.c	Fri May 09 19:30:21 1997
***************
*** 1027,1033 ****
    
    if (pipe_out) {
      close (out_fds[1]);
! #ifdef __EMX__
      /* Need binary mode set for OS/2. */
      *pipe_out = fdopen (out_fds[0], "rb");
  #else
--- 1027,1033 ----
    
    if (pipe_out) {
      close (out_fds[1]);
! #if defined(__EMX__) || defined(CYGWIN32)
      /* Need binary mode set for OS/2. */
      *pipe_out = fdopen (out_fds[0], "rb");
  #else
***************
*** 1039,1045 ****
  
    if (pipe_in) {
      close (in_fds[0]);
! #ifdef __EMX__
      /* Need binary mode set for OS/2 */
      *pipe_in = fdopen (in_fds[1], "wb");
  #else
--- 1039,1045 ----
  
    if (pipe_in) {
      close (in_fds[0]);
! #if defined(__EMX__) || defined(CYGWIN32)
      /* Need binary mode set for OS/2 */
      *pipe_in = fdopen (in_fds[1], "wb");
  #else
***************
*** 1051,1057 ****
  
    if (pipe_err) {
      close (err_fds[1]);
! #ifdef __EMX__
      /* Need binary mode set for OS/2. */
      *pipe_err = fdopen (err_fds[0], "rb");
  #else
--- 1051,1057 ----
  
    if (pipe_err) {
      close (err_fds[1]);
! #if defined(__EMX__) || defined(CYGWIN32)
      /* Need binary mode set for OS/2. */
      *pipe_err = fdopen (err_fds[0], "rb");
  #else
diff -cr apache_1.2b10/src/conf.h apache_1.2b10_nt/src/conf.h
*** apache_1.2b10/src/conf.h	Mon Apr 28 05:52:07 1997
--- apache_1.2b10_nt/src/conf.h	Sat May 10 03:02:09 1997
***************
*** 267,272 ****
--- 267,282 ----
  #define JMP_BUF sigjmp_buf
  #include <sys/time.h>     
  
+ 
+ #elif defined(CYGWIN32)
+ #define NO_KILLPG
+ #define NO_LINGCLOSE
+ #define JMP_BUF jmp_buf
+ #define NEED_INITGROUPS
+ #define USE_LONGJMP
+ #define NO_USE_SIGACTION
+ #define NEED_WAITPID
+ 
  #elif defined(SCO)
  #undef HAVE_GMTOFF
  #undef NO_KILLPG
diff -cr apache_1.2b10/src/http_core.c apache_1.2b10_nt/src/http_core.c
*** apache_1.2b10/src/http_core.c	Thu Apr 24 12:19:09 1997
--- apache_1.2b10_nt/src/http_core.c	Fri May 09 19:31:23 1997
***************
*** 1327,1333 ****
  	|| (errstatus = set_content_length (r, r->finfo.st_size)))
          return errstatus;
      
! #ifdef __EMX__
      /* Need binary mode for OS/2 */
      f = pfopen (r->pool, r->filename, "rb");
  #else
--- 1327,1333 ----
  	|| (errstatus = set_content_length (r, r->finfo.st_size)))
          return errstatus;
      
! #if defined(__EMX__) || defined(CYGWIN32)
      /* Need binary mode for OS/2 */
      f = pfopen (r->pool, r->filename, "rb");
  #else
diff -cr apache_1.2b10/src/http_main.c apache_1.2b10_nt/src/http_main.c
*** apache_1.2b10/src/http_main.c	Tue Apr 29 04:39:01 1997
--- apache_1.2b10_nt/src/http_main.c	Sat May 10 02:23:57 1997
***************
*** 97,103 ****
--- 97,105 ----
  #include <sys/audit.h>
  #include <prot.h>
  #endif
+ #ifndef CYGWIN32
  #include <netinet/tcp.h>
+ #endif			
  
  #ifdef HAVE_BSTRING_H
  #include <bstring.h>		/* for IRIX, FD_SET calls bzero() */
***************
*** 855,861 ****
  #else
      scoreboard_fname = server_root_relative (p, scoreboard_fname);
  
! #ifdef __EMX__
      /* OS/2 needs binary mode set. */
      scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0644);
  #else
--- 857,863 ----
  #else
      scoreboard_fname = server_root_relative (p, scoreboard_fname);
  
! #if defined(__EMX__) || defined(CYGWIN32)
      /* OS/2 needs binary mode set. */
      scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0644);
  #else
***************
*** 881,887 ****
  #ifdef SCOREBOARD_FILE
      if (scoreboard_fd != -1) pclosef (p, scoreboard_fd);
      
! #ifdef __EMX__    
      /* OS/2 needs binary mode set. */
      scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0666);
  #else
--- 883,889 ----
  #ifdef SCOREBOARD_FILE
      if (scoreboard_fd != -1) pclosef (p, scoreboard_fd);
      
! #if defined(__EMX__) || defined(CYGWIN32)
      /* OS/2 needs binary mode set. */
      scoreboard_fd = popenf(p, scoreboard_fname, O_CREAT|O_BINARY|O_RDWR, 0666);
  #else
***************
*** 1370,1376 ****
          exit(1);
      }
  #else
! #if defined(__EMX__) || defined(MPE)
      /* OS/2 and MPE don't support process group IDs */
      pgrp=-getpid();
  #else
--- 1372,1378 ----
          exit(1);
      }
  #else
! #if defined(__EMX__) || defined(MPE) /* || defined(CYGWIN32) */
      /* OS/2 and MPE don't support process group IDs */
      pgrp=-getpid();
  #else
***************
*** 1415,1421 ****
        name = ent->pw_name;
      } else name = user_name;
  
! #ifndef __EMX__ 
      /* OS/2 dosen't support groups. */
  
      /* Reset `groups' attributes. */
--- 1417,1423 ----
        name = ent->pw_name;
      } else name = user_name;
  
! #if defined(__EMX__) || defined(CYGWIN32)
      /* OS/2 dosen't support groups. */
  
      /* Reset `groups' attributes. */
***************
*** 1690,1697 ****
--- 1692,1702 ----
       */
      ap_setjmp (jmpbuffer);
  #ifndef __EMX__
+ #ifndef CYGWIN32 
+ 
      signal(SIGURG, timeout);
  #endif    
+ #endif    
  
      while (1) {
  	int errsave;
***************
*** 2017,2022 ****
--- 2022,2028 ----
       *
       * If no size is specified, use the kernel default.
       */
+ #ifndef CYGWIN32
      if (server_conf->send_buffer_size) {
          if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
                (char *)&server_conf->send_buffer_size, sizeof(int)) < 0) {
***************
*** 2026,2031 ****
--- 2032,2038 ----
  	    /* not a fatal error */
  	}
      }
+ #endif 		/* CYGWIN32 */
  
  #ifdef MPE
  /* MPE requires CAP=PM and GETPRIVMODE to bind to ports less than 1024 */
diff -cr apache_1.2b10/src/http_request.c apache_1.2b10_nt/src/http_request.c
*** apache_1.2b10/src/http_request.c	Mon Apr 07 13:47:05 1997
--- apache_1.2b10_nt/src/http_request.c	Fri May 09 19:36:33 1997
***************
*** 91,97 ****
      char *lastp;
      int res;
    
! #ifdef __EMX__
      /* OS/2 dosen't have symlinks */
      return OK;
  #else
--- 91,97 ----
      char *lastp;
      int res;
    
! #if defined(__EMX__) || defined(CYGWIN32)
      /* OS/2 dosen't have symlinks */
      return OK;
  #else
diff -cr apache_1.2b10/src/mod_log_config.c apache_1.2b10_nt/src/mod_log_config.c
*** apache_1.2b10/src/mod_log_config.c	Sat Apr 12 06:24:59 1997
--- apache_1.2b10_nt/src/mod_log_config.c	Fri May 09 20:27:13 1997
***************
*** 164,170 ****
  module config_log_module;
  
  static int xfer_flags = ( O_WRONLY | O_APPEND | O_CREAT );
! #ifdef __EMX__
  /* OS/2 dosen't support users and groups */
  static mode_t xfer_mode = ( S_IREAD | S_IWRITE );
  #else
--- 164,170 ----
  module config_log_module;
  
  static int xfer_flags = ( O_WRONLY | O_APPEND | O_CREAT );
! #if defined(__EMX__) || defined(CYGWIN32)
  /* OS/2 dosen't support users and groups */
  static mode_t xfer_mode = ( S_IREAD | S_IWRITE );
  #else
diff -cr apache_1.2b10/src/regex/mkh apache_1.2b10_nt/src/regex/mkh
*** apache_1.2b10/src/regex/mkh	Wed Jul 24 00:06:45 1996
--- apache_1.2b10_nt/src/regex/mkh	Fri May 09 18:51:23 1997
***************
*** 1,6 ****
  #! /bin/sh
  # mkh - pull headers out of C source
! PATH=/bin:/usr/bin ; export PATH
  
  # egrep pattern to pick out marked lines
  egrep='^ =([ 	]|$)'
--- 1,6 ----
  #! /bin/sh
  # mkh - pull headers out of C source
! # giovanni PATH=/bin:/usr/bin ; export PATH
  
  # egrep pattern to pick out marked lines
  egrep='^ =([ 	]|$)'
diff -cr apache_1.2b10/src/util.c apache_1.2b10_nt/src/util.c
*** apache_1.2b10/src/util.c	Sat Apr 12 06:24:59 1997
--- apache_1.2b10_nt/src/util.c	Fri May 09 19:40:49 1997
***************
*** 941,947 ****
  #ifdef MULTIPLE_GROUPS
    int cnt;
  #endif
! #ifdef __EMX__
      /* OS/2 dosen't have Users and Groups */
      return 1;
  #else    
--- 941,947 ----
  #ifdef MULTIPLE_GROUPS
    int cnt;
  #endif
! #if defined(__EMX__) || defined(CYGWIN32)
      /* OS/2 dosen't have Users and Groups */
      return 1;
  #else    
***************
*** 1016,1022 ****
  #ifdef NEED_INITGROUPS
  int initgroups(const char *name, gid_t basegid)
  {
! #if defined(QNX) || defined(MPE)
  /* QNX and MPE do not appear to support supplementary groups. */
  	return 0;
  #else /* ndef QNX */
--- 1016,1022 ----
  #ifdef NEED_INITGROUPS
  int initgroups(const char *name, gid_t basegid)
  {
! #if defined(QNX) || defined(MPE) || defined (CYGWIN32)
  /* QNX and MPE do not appear to support supplementary groups. */
  	return 0;
  #else /* ndef QNX */

===========================================================

ciao,

-giovanni

 
          ***********************************************
          *                                             *
          *                                             *
          *    MATRICE srl                              *
          *    Information Technology Solutions         *
          *                                             *
          *    Giovanni Maruzzelli                      *
          *                                             *
          *                                             *
          *                                             *
          *    maruzz@matrice.it                        *
          *    http://www.matrice.it                    *
          ***********************************************


Mime
View raw message