cvs commit: apache-2.0/src/main config.m4

[rbb]

rbb 99/12/10 12:22:08

  Modified:src/include ap_ac_config.h
   src/main config.m4
  Log:
  We now make the decision to USE_MMAP_FILES based on whether or not APR
  has MMAP.  If APR_HAS_MMAP is true then USE_MMAP_FILES is true.  We also
  no longer check for MMAP in autoconf within Apache.  Apache relies on APR
  to give us MMAP functionality, and therefore doesn't need to check for
  itself.
  
  Revision  ChangesPath
  1.4   +11 -0 apache-2.0/src/include/ap_ac_config.h
  
  Index: ap_ac_config.h
  ===
  RCS file: /home/cvs/apache-2.0/src/include/ap_ac_config.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ap_ac_config.h1999/12/05 08:29:27 1.3
  +++ ap_ac_config.h1999/12/10 20:22:05 1.4
  @@ -67,9 +67,11 @@
   #ifdef WIN32
   #include "ap_config_win32.h"
   #include "../os/win32/os.h"
  +#include "apr_win.h"
   #else
   #include "ap_config_auto.h"
   #include "os.h"
  +#include "apr.h"
   #endif /* WIN32 */
   
   #ifdef STDC_HEADERS
  @@ -301,6 +303,15 @@
   #define XtOffsetOf(s_type,field) offsetof(s_type,field)
   #else
   #define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
  +#endif
  +
  +#undef PACKAGE
  +#undef VERSION
  +
  +#if APR_HAS_MMAP
  +#define USE_MMAP_FILES 1
  +#else
  +#undef USE_MMAP_FILES
   #endif
   
   #endif /* AP_AC_CONFIG_H */
  
  
  
  1.3   +0 -6  apache-2.0/src/main/config.m4
  
  Index: config.m4
  ===
  RCS file: /home/cvs/apache-2.0/src/main/config.m4,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- config.m4 1999/12/01 01:16:09 1.2
  +++ config.m4 1999/12/10 20:22:07 1.3
  @@ -46,9 +46,3 @@
   difftime \
   syslog \
   )
  -AC_FUNC_MMAP
  -
  -dnl XXX - is autoconf's detection routine good enough?
  -if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
  -AC_DEFINE(USE_MMAP_FILES)
  -fi
  
  
  

cvs commit: apache-2.0/src/os/unix os.h os.c

[stoddard]

stoddard99/12/10 08:10:43

  Modified:src/support httpd.exp
   src/os/unix os.h os.c
  Log:
  AIX DSO tweaks. Enable use of native DSO for AIX 4.3 and beyond. Apache DSO
  emulation breaks with 64-bit compiles of Apache and AIX DSO support is broken
  in releases prior to 4.3.
  
  Revision  ChangesPath
  1.4   +1 -1  apache-2.0/src/support/httpd.exp
  
  Index: httpd.exp
  ===
  RCS file: /home/cvs/apache-2.0/src/support/httpd.exp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- httpd.exp 1999/11/30 05:56:17 1.3
  +++ httpd.exp 1999/12/10 16:10:41 1.4
  @@ -1,4 +1,4 @@
  -#!
  +#! .
   ap_MD5Encode
   ap_MD5Final
   ap_MD5Init
  
  
  
  1.6   +4 -1  apache-2.0/src/os/unix/os.h
  
  Index: os.h
  ===
  RCS file: /home/cvs/apache-2.0/src/os/unix/os.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- os.h  1999/11/30 05:56:11 1.5
  +++ os.h  1999/12/10 16:10:42 1.6
  @@ -104,10 +104,13 @@
   #endif
   
   /*
  - * Do not use native AIX DSO support
  + * Do not use native AIX DSO support on releases of AIX prior
  + * to V4.3
*/
   #ifdef AIX
  +#if AIX < 43
   #undef HAVE_DLFCN_H
  +#endif
   #endif
   
   #ifdef HAVE_DLFCN_H
  
  
  
  1.5   +61 -1 apache-2.0/src/os/unix/os.c
  
  Index: os.c
  ===
  RCS file: /home/cvs/apache-2.0/src/os/unix/os.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- os.c  1999/10/13 02:41:08 1.4
  +++ os.c  1999/12/10 16:10:42 1.5
  @@ -1,3 +1,60 @@
  +/* 
  + * Copyright (c) 1998-1999 The Apache Group.  All rights reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *notice, this list of conditions and the following disclaimer. 
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *notice, this list of conditions and the following disclaimer in
  + *the documentation and/or other materials provided with the
  + *distribution.
  + *
  + * 3. All advertising materials mentioning features or use of this
  + *software must display the following acknowledgment:
  + *"This product includes software developed by the Apache Group
  + *for use in the Apache HTTP server project (http://www.apache.org/)."
  + *
  + * 4. The names "Apache Server" and "Apache Group" must not be used to
  + *endorse or promote products derived from this software without
  + *prior written permission. For written permission, please contact
  + *[EMAIL PROTECTED]
  + *
  + * 5. Products derived from this software may not be called "Apache"
  + *nor may "Apache" appear in their names without prior written
  + *permission of the Apache Group.
  + *
  + * 6. Redistributions of any form whatsoever must retain the following
  + *acknowledgment:
  + *"This product includes software developed by the Apache Group
  + *for use in the Apache HTTP server project (http://www.apache.org/)."
  + *
  + * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
  + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  + * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  + * OF THE POSSIBILITY OF SUCH DAMAGE.
  + * 
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Group and was originally based
  + * on public domain software written at the National Center for
  + * Supercomputing Applications, University of Illinois, Urbana-Champaign.
  + * For more information on the Apache Group and the Apache HTTP server
  + * project, please see .
  + *
  + */
  +
   /*
* This file will include OS specific functions which are not inlineable.
* Any inlineable functions should be defined in os-inline.c instead.
  @@ -14,10 +71,13 @@
   void ap_is_not_her

cvs commit: apache-1.3/htdocs/manual/misc FAQ-D.html

[coar]

coar99/12/10 06:56:26

  Modified:htdocs/manual/misc FAQ-D.html
  Log:
Add a note about DNS being required on Windows.
  
  PR:   5451
  Submitted by: Hank Laskey <[EMAIL PROTECTED]>
  Reviewed by:  Ken Coar
  
  Revision  ChangesPath
  1.5   +10 -2 apache-1.3/htdocs/manual/misc/FAQ-D.html
  
  Index: FAQ-D.html
  ===
  RCS file: /home/cvs/apache-1.3/htdocs/manual/misc/FAQ-D.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FAQ-D.html1999/09/17 17:31:37 1.4
  +++ FAQ-D.html1999/12/10 14:56:26 1.5
  @@ -31,7 +31,7 @@
 
 Apache Server Frequently Asked Questions
 
  -  $Revision: 1.4 $ ($Date: 1999/09/17 17:31:37 $)
  +  $Revision: 1.5 $ ($Date: 1999/12/10 14:56:26 $)
 
 
 The latest version of this FAQ is always available from the main
  @@ -356,7 +356,15 @@
 
 
 in the file.  Correct it if there one there with wrong information, or
  -  add one if you don't already have one.  Then try to start the server
  +  add one if you don't already have one.
  +  
  +  
  +  Also, make sure that your Windows system has DNS enabled.  See the TCP/IP
  +  setup component of the Networking or Internet Options control panel.
  +  
  +  
  +  After verifying that DNS is enabled and that you have a valid hostname
  +  in your ServerName directive, try to start the server
 again.
 
 
  
  
  

cvs commit: apache-1.3/src/modules/standard mod_mime.c

[coar]

coar99/12/10 06:51:04

  Modified:src/modules/standard mod_mime.c
  Log:
isascii isn't universal, alas..
  
  Submitted by: gil <[EMAIL PROTECTED]>
  Reviewed by:  Martin Kraemer, Ken Coar
  
  Revision  ChangesPath
  1.51  +11 -3 apache-1.3/src/modules/standard/mod_mime.c
  
  Index: mod_mime.c
  ===
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_mime.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- mod_mime.c1999/12/09 18:10:34 1.50
  +++ mod_mime.c1999/12/10 14:51:03 1.51
  @@ -68,6 +68,13 @@
   #include "http_config.h"
   #include "http_log.h"
   
  +/*
  + * isascii(c) isn't universal, and even those places where it is
  + * defined it's not always right for our needs.  Roll our own that
  + * we can rely on.
  + */
  +#define ap_isascii(c) ((OS_ASC(c) & ~0177) != 0)
  +
   typedef struct handlers_info {
   char *name;
   } handlers_info;
  @@ -338,7 +345,7 @@
   {
   int res;
   
  -res = (isascii(c) && isgraph(c)
  +res = (ap_isascii(c) && isgraph(c)
   && (strchr(tspecial, c) == NULL)) ? 1 : -1;
   return res;
   }
  @@ -347,7 +354,8 @@
   {
   int res;
   
  -res = (isascii(c) && (c != '"') && (c != '\\') && (c != '\n')) ? 1 : -1;
  +res = (ap_isascii(c) && (c != '"') && (c != '\\') && (c != '\n'))
  + ? 1 : -1;
   return res;
   }
   
  @@ -358,7 +366,7 @@
   
   if (((s + 1) != NULL) && (*s == '\\')) {
c = (int) *(s + 1);
  - if (isascii(c)) {
  + if (ap_isascii(c)) {
res = 1;
}
   }
  
  
  

cvs commit: apache-1.3/src/os/os390 ebcdic.c ebcdic.h

[martin]

martin  99/12/10 04:28:28

  Modified:src/os/os390 ebcdic.c ebcdic.h
  Log:
  Under the assumption that the recent CRLF change makes the
  *_strictly kludge no longer necessary, I removed that part
  of ebcdic.[ch]. This is untested by me, so please tell me
  if it breaks anything for you and I'll revert it.
  
  Revision  ChangesPath
  1.2   +2 -51 apache-1.3/src/os/os390/ebcdic.c
  
  Index: ebcdic.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/os/os390/ebcdic.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ebcdic.c  1999/12/09 17:12:12 1.1
  +++ ebcdic.c  1999/12/10 12:28:26 1.2
  @@ -70,7 +70,7 @@
   Bijective EBCDIC (character set IBM-1047) to US-ASCII table:
   This table is bijective - there are no ambigous or duplicate characters.
   */
  -const unsigned char os_toascii_strictly[256] = {
  +const unsigned char os_toascii[256] = {
   0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f, /* 00-0f:   */
   0x87, 0x8d, 0x8e, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /*  */
   0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97, /* 10-1f:   */
  @@ -105,49 +105,6 @@
   0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f  /* 0123456789.. */
   };
   
  -/*
  -Server EBCDIC (character set IBM-1047) to US-ASCII table:
  -This table is a copy of the os_toascii_strictly bijective table above.
  -The only change is that hex 0a (\012 octal) is mapped to hex 0a
  -(ASCII's line feed) instead of hex 8e.  This is done because throughout
  -Apache, protocol string definitions hardcode the linefeed as \012 (octal):
  -"Content-Type: text/plain\015\012".  Without this kludge all protocol
  -string definitions would need to be changed from ...\012 to ...\025.
  -*/
  -const unsigned char os_toascii[256] = {
  -0x00, 0x01, 0x02, 0x03, 0x85, 0x09, 0x86, 0x7f, /* 00-0f:   */
  -0x87, 0x8d, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, /*  */
  -0x10, 0x11, 0x12, 0x13, 0x8f, 0x0a, 0x08, 0x97, /* 10-1f:   */
  -0x18, 0x19, 0x9c, 0x9d, 0x1c, 0x1d, 0x1e, 0x1f, /*  */
  -0x80, 0x81, 0x82, 0x83, 0x84, 0x92, 0x17, 0x1b, /* 20-2f:   */
  -0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x05, 0x06, 0x07, /*  */
  -0x90, 0x91, 0x16, 0x93, 0x94, 0x95, 0x96, 0x04, /* 30-3f:   */
  -0x98, 0x99, 0x9a, 0x9b, 0x14, 0x15, 0x9e, 0x1a, /*  */
  -0x20, 0xa0, 0xe2, 0xe4, 0xe0, 0xe1, 0xe3, 0xe5, /* 40-4f:   */
  -0xe7, 0xf1, 0xa2, 0x2e, 0x3c, 0x28, 0x2b, 0x7c, /*  ...<(+| */
  -0x26, 0xe9, 0xea, 0xeb, 0xe8, 0xed, 0xee, 0xef, /* 50-5f:   */
  -0xec, 0xdf, 0x21, 0x24, 0x2a, 0x29, 0x3b, 0x5e, /* &.!$*);^ */
  -0x2d, 0x2f, 0xc2, 0xc4, 0xc0, 0xc1, 0xc3, 0xc5, /* 60-6f:   */
  -0xc7, 0xd1, 0xa6, 0x2c, 0x25, 0x5f, 0x3e, 0x3f, /* -/.,%_>? */
  -0xf8, 0xc9, 0xca, 0xcb, 0xc8, 0xcd, 0xce, 0xcf, /* 70-7f:   */
  -0xcc, 0x60, 0x3a, 0x23, 0x40, 0x27, 0x3d, 0x22, /* .`:#@'=" */
  -0xd8, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, /* 80-8f:   */
  -0x68, 0x69, 0xab, 0xbb, 0xf0, 0xfd, 0xfe, 0xb1, /* .abcdefghi.. */
  -0xb0, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, /* 90-9f:   */
  -0x71, 0x72, 0xaa, 0xba, 0xe6, 0xb8, 0xc6, 0xa4, /* .jklmnopqr.. */
  -0xb5, 0x7e, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, /* a0-af:   */
  -0x79, 0x7a, 0xa1, 0xbf, 0xd0, 0x5b, 0xde, 0xae, /* .~stuvwxyz...[.. */
  -0xac, 0xa3, 0xa5, 0xb7, 0xa9, 0xa7, 0xb6, 0xbc, /* b0-bf:   */
  -0xbd, 0xbe, 0xdd, 0xa8, 0xaf, 0x5d, 0xb4, 0xd7, /* .].. */
  -0x7b, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, /* c0-cf:   */
  -0x48, 0x49, 0xad, 0xf4, 0xf6, 0xf2, 0xf3, 0xf5, /* {ABCDEFGHI.. */
  -0x7d, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, /* d0-df:   */
  -0x51, 0x52, 0xb9, 0xfb, 0xfc, 0xf9, 0xfa, 0xff, /* }JKLMNOPQR.. */
  -0x5c, 0xf7, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, /* e0-ef:   */
  -0x59, 0x5a, 0xb2, 0xd4, 0xd6, 0xd2, 0xd3, 0xd5, /* \.STUVWXYZ.. */
  -0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, /* f0-ff:   */
  -0x38, 0x39, 0xb3, 0xdb, 0xdc, 0xd9, 0xda, 0x9f  /* 0123456789.. */
  -};
   
   /*
   The US-ASCII to EBCDIC (character set IBM-1047) table:
  @@ -200,14 +157,8 @@
   while (count-- != 0) {
   *udest++ = os_toascii[*usrce++];
   }
  -}
  -void
  -ebcdic2ascii_strictly(unsigned char *dest, const unsigned char *srce, size_t 
count)
  -{
  -while (count-- != 0) {
  -*dest++ = os_toascii_strictly[*srce++];
  -}
   }
  +
   void
   ascii2ebcdic(void *dest, const void *srce, size_t count)
   {
  
  
  
  1.2   +4 -1  apache-1.3/src/os/os390/ebcdic.h
  
  Index: ebcdic.h
  ===
  RCS 

cvs commit: apache-1.3 STATUS

[martin]

martin  99/12/10 04:22:42

  Modified:.STATUS
  Log:
  MPE patch committed
  
  Revision  ChangesPath
  1.766 +1 -5  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.765
  retrieving revision 1.766
  diff -u -r1.765 -r1.766
  --- STATUS1999/12/09 23:26:29 1.765
  +++ STATUS1999/12/10 12:22:41 1.766
  @@ -1,5 +1,5 @@
 1.3 STATUS:
  -  Last modified at [$Date: 1999/12/09 23:26:29 $]
  +  Last modified at [$Date: 1999/12/10 12:22:41 $]
   
   Release:
   
  @@ -176,10 +176,6 @@
   Status: Greg +1, Martin +1 (on concept)
   
   In progress:
  -
  -* Mark Bixby's freshening up the MPE/iX port (DSO support)
  - Message-ID: <[EMAIL PROTECTED]>
  - Status: Martin +1 (untested)
   
   * Doug MacEachern's libapr - Generic Apache Request Library (Alpha)
 This package contains modules for manipulating client request data
  
  
  

cvs commit: apache-1.3/src/os/mpeix dlopen.c gettimeofday.c mpe_dl_stub.c os-inline.c os.c os.h Makefile.tmpl README

[martin]

martin  99/12/10 03:04:03

  Modified:.configure
   src  Configure
   src/ap   ap_getpass.c
   src/helpers TestCompile install.sh
   src/include ap_config.h
   src/main http_main.c rfc1413.c
   src/support ab.c
  Added:   src/os/mpeix dlopen.c gettimeofday.c mpe_dl_stub.c
os-inline.c os.c os.h Makefile.tmpl README
  Log:
  Freshen up the MPE port. MPE/iX now supports dynamic loading of modules.
  
  Submitted by:   Mark Bixby <[EMAIL PROTECTED]>
  Reviewed by:Martin Kraemer
  
  Revision  ChangesPath
  1.114 +3 -0  apache-1.3/configure
  
  Index: configure
  ===
  RCS file: /export/home/cvs/apache-1.3/configure,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- configure 1999/12/09 17:19:35 1.113
  +++ configure 1999/12/10 11:03:00 1.114
  @@ -355,6 +355,9 @@
   set -- --with-layout="$default_layout" "$@"
   fi
   ;;
  +*MPE/iX* )
  + iflags_program="-m 755"
  + ;;
   esac
   
   ##
  
  
  
  1.379 +13 -6 apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.378
  retrieving revision 1.379
  diff -u -r1.378 -r1.379
  --- Configure 1999/12/09 17:19:30 1.378
  +++ Configure 1999/12/10 11:03:07 1.379
  @@ -278,10 +278,11 @@
DEF_WANTHSREGEX=yes
;;
   *MPE/iX*)
  - OS='MPE/iX'
  + export OS='MPE/iX'
  + OSDIR='os/mpeix'
CFLAGS="$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
  - LIBS="$LIBS -lsocket -lsvipc"
  - LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
  + LIBS="$LIBS -lsocket -lsvipc -lcurses"
  + LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph;nmstack=1024000\""
CAT="/bin/cat" # built-in cat is badly broken for stdin redirection
;;
   *-apple-aux3*)
  @@ -906,9 +907,9 @@
   ##
   TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'`
   if [ "x$TCPP" != "x" ]; then
  -CPP=`CC=$CC CPP=$TCPP ./helpers/findcpp.sh`
  +CPP=`env CC="$CC" CPP=$TCPP ./helpers/findcpp.sh`
   else
  -CPP=`CC=$CC ./helpers/findcpp.sh`
  +CPP=`env CC="$CC" ./helpers/findcpp.sh`
   fi
   if [ "x$TCPP" = "x" ]; then
   echo "CPP=$CPP" >> Makefile.config
  @@ -934,7 +935,7 @@
   echo "" >>$AP_CONFIG_AUTO_H
   echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H
   name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]' 
'[A-Z]'`"
  -CPP=$CPP ./helpers/checkheader.sh $header
  +env CPP="$CPP" ./helpers/checkheader.sh $header
   if [ $? -eq 0 ]; then
echo "#ifndef HAVE_${name}" >>$AP_CONFIG_AUTO_H
echo "#define HAVE_${name} 1" >>$AP_CONFIG_AUTO_H
  @@ -1002,6 +1003,12 @@
   SHARED_CORE_EP='lib$(TARGET).ep'
   SHCORE_IMPLIB=''
   case "$PLAT" in
  + *MPE/iX*)
  + LD_SHLIB=ld 
  + LDFLAGS_SHLIB='-b -a archive'
  + LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
  + LIBS_SHLIB='$(OSDIR)/mpe_dl_stub.o' 
  + ;;
*-linux1)
CFLAGS_SHLIB="-fpic"
LDFLAGS_SHLIB="-Bshareable"
  
  
  
  1.3   +41 -14apache-1.3/src/ap/ap_getpass.c
  
  Index: ap_getpass.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/ap/ap_getpass.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ap_getpass.c  1999/10/21 20:44:09 1.2
  +++ ap_getpass.c  1999/12/10 11:03:13 1.3
  @@ -85,26 +85,53 @@
   #define ERR_OVERFLOW 5
   
   #ifdef MPE
  -/*
  - * MPE lacks getpass() and a way to suppress stdin echo.  So for now, just
  - * issue the prompt and read the results with echo.  (Ugh).
  - */
  +#include 
   
  -static char *getpass(const char *prompt)
  +char *
  +getpass(const char *prompt)
   {
  -static char password[MAX_STRING_LEN];
  + static char buf[MAX_STRING_LEN+1];  /* null byte at end */
  + char*ptr;
  + sigset_tsig, sigsave;
  + struct termios  term, termsave;
  + FILE*fp,*outfp;
  + int c;
   
  -fputs(prompt, stderr);
  -gets((char *) &password);
  +if ((outfp = fp = fopen("/dev/tty", "w+")) == NULL) {
  +outfp = stderr;
  +fp = stdin;
  +}
   
  -if (strlen((char *) &password) > (MAX_STRING_LEN - 1)) {
  - password[MAX_STRING_LEN - 1] = '\0';
  -}
  + sigemptyset(&sig);  /* block SIGINT & SIGTSTP, save signal mask */
  + sigaddset(&sig, SIGINT);
  + sigaddset(&sig, SIGTSTP);
  + sigprocmask(SIG_BLOCK, &sig, &sigsave);
   
  -return (char

cvs commit: apache-1.3/src/os/mpeix - New directory

[martin]

martin  99/12/10 02:56:20

  apache-1.3/src/os/mpeix - New directory