cvs commit: apache/src Configure conf.h mod_userdir.c util_script.c util_script.h

[Randy Terbush <ra...@hyperreal.com>]

randy       96/12/08 17:00:43

  Modified:    src       Configure conf.h mod_userdir.c util_script.c
                        util_script.h
  Log:
  OS/2 changes
  Submitted by:	Garey Smiley
  
  Revision  Changes    Path
  1.48      +3 -2      apache/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Configure,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -C3 -r1.47 -r1.48
  *** Configure	1996/12/08 23:54:49	1.47
  --- Configure	1996/12/09 01:00:38	1.48
  ***************
  *** 158,166 ****
    	OS='DG/UX 5.4'
    	CFLAGS="$CFLAGS -DDGUX"
    	;;
  !     OS/2)
    	OS='EMX OS/2'
  ! 	CFLAGS="$CFLAGS -Zbsd-signals -Zbin-files -DNO_KILLPG -DNEED_STRCASECMP -DNO_SETSID -g"
    	LIBS="$LIBS -lsocket -llibufc -lgdbm -lbsd"
    	;;
        *-hp-hpux10.*)
  --- 158,167 ----
    	OS='DG/UX 5.4'
    	CFLAGS="$CFLAGS -DDGUX"
    	;;
  !     *OS/2*)
  !         DEF_WANTHSREGEX=yes
    	OS='EMX OS/2'
  !         CFLAGS="$CFLAGS -Zbsd-signals -Zbin-files -DTCPIPV4 -g"
    	LIBS="$LIBS -lsocket -llibufc -lgdbm -lbsd"
    	;;
        *-hp-hpux10.*)
  
  
  
  1.55      +3 -0      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -C3 -r1.54 -r1.55
  *** conf.h	1996/12/05 10:30:07	1.54
  --- conf.h	1996/12/09 01:00:39	1.55
  ***************
  *** 375,380 ****
  --- 375,383 ----
    #define NO_SETSID
    /* Add some drive name support */
    #define chdir _chdir2
  + #include <sys/time.h>     
  + #define MAXSOCKETS 200
  +     
    
    /* Unknown system - Edit these to match */
    #else
  
  
  
  1.11      +5 -0      apache/src/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_userdir.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** mod_userdir.c	1996/12/01 20:29:24	1.10
  --- mod_userdir.c	1996/12/09 01:00:39	1.11
  ***************
  *** 142,148 ****
  --- 142,153 ----
          if (strchr(userdir, '*'))
    	x = getword(r->pool, &userdir, '*');
    
  + #ifdef __EMX__
  +       /* Add support for OS/2 drive letters */
  +       if ((userdir[0] == '/') || (userdir[1] == ':')) {
  + #else
          if (userdir[0] == '/') {
  + #endif
    	if (x) {
    	  if (strchr(x, ':')) {
    	    redirect = pstrcat(r->pool, x, w, userdir, dname, NULL);
  
  
  
  1.29      +1 -1      apache/src/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util_script.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -C3 -r1.28 -r1.29
  *** util_script.c	1996/12/01 20:29:33	1.28
  --- util_script.c	1996/12/09 01:00:40	1.29
  ***************
  *** 367,373 ****
    }
    
    #ifdef __EMX__
  ! char **create_argv_cmd(pool *p, char *av0, char *args, char *path) {
        register int x,n;
        char **av;
        char *w;
  --- 367,373 ----
    }
    
    #ifdef __EMX__
  ! char **create_argv_cmd(pool *p, char *av0, const char *args, char *path) {
        register int x,n;
        char **av;
        char *w;
  
  
  
  1.10      +1 -1      apache/src/util_script.h
  
  Index: util_script.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util_script.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -C3 -r1.9 -r1.10
  *** util_script.h	1996/12/01 20:29:36	1.9
  --- util_script.h	1996/12/09 01:00:40	1.10
  ***************
  *** 52,58 ****
    
    char **create_argv(pool *p, char *av0, const char *args);
    #ifdef __EMX__
  ! char **create_argv_cmd(pool *p, char *av0, char *args, char *path);
    #endif
    char **create_environment(pool *p, table *t);
    void add_cgi_vars(request_rec *r);
  --- 52,58 ----
    
    char **create_argv(pool *p, char *av0, const char *args);
    #ifdef __EMX__
  ! char **create_argv_cmd(pool *p, char *av0, const char *args, char *path);
    #endif
    char **create_environment(pool *p, table *t);
    void add_cgi_vars(request_rec *r);