cvs commit: apache-1.2/htdocs/manual index.html

[coar]

coar99/08/30 15:20:40

  Modified:htdocs/manual index.html
  Log:
The 'search' link no longer works for the 1.2 docs, so remove
it rather than pointing it to the 1.3 docco.
  
  Revision  ChangesPath
  1.15  +0 -7  apache-1.2/htdocs/manual/index.html
  
  Index: index.html
  ===
  RCS file: /export/home/cvs/apache-1.2/htdocs/manual/index.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- index.html1997/06/04 11:07:48 1.14
  +++ index.html1999/08/30 22:20:31 1.15
  @@ -30,13 +30,6 @@
   
   
   Apache Reference Manual
  -
  - http://www.apache.org/manual-index/docs";
  - >Search
  - the master manual pages for key words
  - 
  -
   
   Compiling and Installing Apache
   Starting Apache
  
  
  

cvs commit: apache-site/dist .htaccess

[coar]

coar99/08/30 15:17:35

  Modified:dist .htaccess
  Log:
Rearrange the AddDescription lines so they work as intended..
and add the 404.html file to the 'don't show' list.  (Why is
it there, anyway?)
  
  Revision  ChangesPath
  1.23  +9 -9  apache-site/dist/.htaccess
  
  Index: .htaccess
  ===
  RCS file: /export/home/cvs/apache-site/dist/.htaccess,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- .htaccess 1999/08/19 19:30:57 1.22
  +++ .htaccess 1999/08/30 22:17:34 1.23
  @@ -1,4 +1,5 @@
   IndexOptions FancyIndexing ScanHTMLTitles
  +AddDescription "PGP signature" .asc
   AddDescription "1.2.6 compressed source" apache_1.2.6.tar.Z
   AddDescription "1.2.6 gzipped source" apache_1.2.6.tar.gz
   AddDescription "1.3.1 compressed source" apache_1.3.1.tar.Z
  @@ -19,13 +20,12 @@
   AddDescription "1.3.9 compressed source" apache_1.3.9.tar.Z
   AddDescription "1.3.9 gzipped source" apache_1.3.9.tar.gz
   AddDescription "1.3.9 Win32 binary" apache_1_3_9_win32.exe
  -AddDescription "List of changes in 1.3" /www/apache.org/dist/CHANGES_1.3
  -AddDescription "List of changes in 1.2" /www/apache.org/dist/CHANGES_1.2
  -AddDescription "Developer PGP keys" /www/apache.org/dist/KEYS
  -AddDescription "PGP signature" *.asc
  +AddDescription "List of changes in 1.3" CHANGES_1.3
  +AddDescription "List of changes in 1.2" CHANGES_1.2
  +AddDescription "Developer PGP keys" KEYS
   AddDescription "Apache 1.3.9 Released" Announcement.txt
  -AddDescription "Binary distributions" /www/apache.org/dist/binaries
  -AddDescription "Contributed software" /www/apache.org/dist/contrib
  -AddDescription "Old source & binaries" /www/apache.org/dist/old
  -AddDescription "Official patches" /www/apache.org/dist/patches
  -IndexIgnore CVS
  +AddDescription "Binary distributions" binaries
  +AddDescription "Contributed software" contrib
  +AddDescription "Old source & binaries" old
  +AddDescription "Official patches" patches
  +IndexIgnore CVS 404.html
  
  
  

cvs commit: apache-2.0/src ApacheCore.def

[stoddard]

stoddard99/08/30 13:39:36

  Modified:src  ApacheCore.def
  Log:
  Forgot this hook...
  
  Revision  ChangesPath
  1.4   +1 -0  apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ApacheCore.def1999/08/30 15:21:29 1.3
  +++ ApacheCore.def1999/08/30 20:39:33 1.4
  @@ -365,3 +365,4 @@
ap_process_http_connection @360
ap_hook_check_user_id @361
ap_hook_auth_checker @362
  + ap_hook_fixups @363
  
  
  

cvs commit: apache-2.0/src/os/win32 modules.c

[stoddard]

stoddard99/08/30 13:37:22

  Modified:src/os/win32 modules.c
  Log:
  Link in the winnt mpm
  
  Revision  ChangesPath
  1.3   +2 -0  apache-2.0/src/os/win32/modules.c
  
  Index: modules.c
  ===
  RCS file: /home/cvs/apache-2.0/src/os/win32/modules.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- modules.c 1999/08/27 22:57:24 1.2
  +++ modules.c 1999/08/30 20:37:16 1.3
  @@ -29,6 +29,7 @@
   
   module *ap_prelinked_modules[] = {
 &core_module,
  +  &mpm_winnt_module,
   //  &so_module,
 &mime_module,
 &access_module,
  @@ -51,6 +52,7 @@
   };
   module *ap_preloaded_modules[] = {
 &core_module,
  +  &mpm_winnt_module,
   //  &so_module,
 &mime_module,
 &access_module,
  
  
  

cvs commit: apache-2.0/src Makefile.nt

[stoddard]

stoddard99/08/30 09:48:37

  Modified:src  Makefile.nt
  Log:
  Remove mod_status and mod_rewrite from the build for now.
  
  Revision  ChangesPath
  1.3   +8 -8  apache-2.0/src/Makefile.nt
  
  Index: Makefile.nt
  ===
  RCS file: /home/cvs/apache-2.0/src/Makefile.nt,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Makefile.nt   1999/08/27 22:56:42 1.2
  +++ Makefile.nt   1999/08/30 16:48:35 1.3
  @@ -77,10 +77,10 @@
 nmake /nologo CFG="ApacheModuleHeaders - Win32 %LONG%" -f 
ApacheModuleHeaders.mak
 nmake /nologo CFG="ApacheModuleSpeling - Win32 %LONG%" -f 
ApacheModuleSpeling.mak
 nmake /nologo CFG="ApacheModuleUserTrack - Win32 %LONG%" -f 
ApacheModuleUserTrack.mak
  -  nmake /nologo CFG="ApacheModuleRewrite - Win32 %LONG%" -f 
ApacheModuleRewrite.mak
  +# nmake /nologo CFG="ApacheModuleRewrite - Win32 %LONG%" -f 
ApacheModuleRewrite.mak
cd ..\..
cd modules\proxy
  -  nmake /nologo CFG="ApacheModuleProxy - Win32 %LONG%" -f 
ApacheModuleProxy.mak
  +# nmake /nologo CFG="ApacheModuleProxy - Win32 %LONG%" -f 
ApacheModuleProxy.mak
cd ..\..
   
   _install:
  @@ -91,17 +91,17 @@
-mkdir $(INSTDIR)\bin
copy Apache%SHORT%\Apache.exe $(INSTDIR)
copy Core%SHORT%\ApacheCore.dll $(INSTDIR)
  - copy os\win32\ApacheModuleStatus%SHORT%\ApacheModuleStatus.dll 
$(INSTDIR)\modules
  +#copy os\win32\ApacheModuleStatus%SHORT%\ApacheModuleStatus.dll 
$(INSTDIR)\modules
   #   copy os\win32\ApacheModuleInfo%SHORT%\ApacheModuleInfo.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleAuthAnon%SHORT%\ApacheModuleAuthAnon.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleDigest%SHORT%\ApacheModuleDigest.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleCERNMeta%SHORT%\ApacheModuleCERNMeta.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleExpires%SHORT%\ApacheModuleExpires.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleHeaders%SHORT%\ApacheModuleHeaders.dll 
$(INSTDIR)\modules
  - copy os\win32\ApacheModuleRewrite%SHORT%\ApacheModuleRewrite.dll 
$(INSTDIR)\modules
  +#copy os\win32\ApacheModuleRewrite%SHORT%\ApacheModuleRewrite.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleSpeling%SHORT%\ApacheModuleSpeling.dll 
$(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrack%SHORT%\ApacheModuleUserTrack.dll 
$(INSTDIR)\modules
  - copy modules\proxy\%LONG%\ApacheModuleProxy.dll $(INSTDIR)\modules
  +#copy modules\proxy\%LONG%\ApacheModuleProxy.dll $(INSTDIR)\modules
copy support\%LONG%\htpasswd.exe $(INSTDIR)\bin
copy support\%LONG%\htdigest.exe $(INSTDIR)\bin
   
  @@ -128,7 +128,7 @@
 nmake /nologo CFG="ApacheCore - Win32 %LONG%" -f ApacheCore.mak clean
 nmake /nologo CFG="Apache - Win32 %LONG%" -f Apache.mak clean
cd os\win32
  -  nmake /nologo CFG="ApacheModuleStatus - Win32 %LONG%" -f 
ApacheModuleStatus.mak clean
  +# nmake /nologo CFG="ApacheModuleStatus - Win32 %LONG%" -f 
ApacheModuleStatus.mak clean
   # nmake /nologo CFG="ApacheModuleInfo - Win32 %LONG%" -f 
ApacheModuleInfo.mak clean
 nmake /nologo CFG="ApacheModuleAuthAnon - Win32 %LONG%" -f 
ApacheModuleAuthAnon.mak clean
 nmake /nologo CFG="ApacheModuleDigest - Win32 %LONG%" -f 
ApacheModuleDigest.mak clean
  @@ -137,10 +137,10 @@
 nmake /nologo CFG="ApacheModuleHeaders - Win32 %LONG%" -f 
ApacheModuleHeaders.mak clean
 nmake /nologo CFG="ApacheModuleSpeling - Win32 %LONG%" -f 
ApacheModuleSpeling.mak clean
 nmake /nologo CFG="ApacheModuleUserTrack - Win32 %LONG%" -f 
ApacheModuleUserTrack.mak clean
  -  nmake /nologo CFG="ApacheModuleRewrite - Win32 %LONG%" -f 
ApacheModuleRewrite.mak clean
  +# nmake /nologo CFG="ApacheModuleRewrite - Win32 %LONG%" -f 
ApacheModuleRewrite.mak clean
cd ..\..
cd modules\proxy
  -  nmake /nologo CFG="ApacheModuleProxy - Win32 %LONG%" -f 
ApacheModuleProxy.mak clean
  +# nmake /nologo CFG="ApacheModuleProxy - Win32 %LONG%" -f 
ApacheModuleProxy.mak clean
cd ..\..
cd os\win32\installer\installdll
 nmake /nologo CFG="install - Win32 %LONG%" -f install.mak clean
  
  
  

cvs commit: apache-2.0/src/modules/standard mod_cern_meta.c mod_expires.c mod_headers.c mod_speling.c mod_usertrack.c

[stoddard]

stoddard99/08/30 08:43:50

  Modified:src/modules/standard mod_cern_meta.c mod_expires.c
mod_headers.c mod_speling.c mod_usertrack.c
  Log:
  Port a few more modules to use the new hooks style.
  
  Revision  ChangesPath
  1.2   +8 -16 apache-2.0/src/modules/standard/mod_cern_meta.c
  
  Index: mod_cern_meta.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cern_meta.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_cern_meta.c   1999/08/24 06:55:25 1.1
  +++ mod_cern_meta.c   1999/08/30 15:43:47 1.2
  @@ -370,26 +370,18 @@
   
   return rv;
   }
  -
  +static void register_hooks(void)
  +{
  +ap_hook_fixups(add_cern_meta_data,NULL,NULL,HOOK_MIDDLE);
  +}
   module MODULE_VAR_EXPORT cern_meta_module =
   {
  -STANDARD_MODULE_STUFF,
  -NULL,/* initializer */
  -create_cern_meta_dir_config, /* dir config creater */
  -merge_cern_meta_dir_configs, /* dir merger --- default is to 
override */
  +STANDARD20_MODULE_STUFF,
  +create_cern_meta_dir_config,/* dir config creater */
  +merge_cern_meta_dir_configs,/* dir merger --- default is to override */
   NULL,/* server config */
   NULL,/* merge server configs */
   cern_meta_cmds,  /* command table */
   NULL,/* handlers */
  -NULL,/* filename translation */
  -NULL,/* check_user_id */
  -NULL,/* check auth */
  -NULL,/* check access */
  -NULL,/* type_checker */
  -add_cern_meta_data,  /* fixups */
  -NULL,/* logger */
  -NULL,/* header parser */
  -NULL,/* child_init */
  -NULL,/* child_exit */
  -NULL /* post read-request */
  +register_hooks   /* register hooks */
   };
  
  
  
  1.2   +6 -14 apache-2.0/src/modules/standard/mod_expires.c
  
  Index: mod_expires.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_expires.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_expires.c 1999/08/24 06:55:26 1.1
  +++ mod_expires.c 1999/08/30 15:43:47 1.2
  @@ -485,26 +485,18 @@
   ap_table_setn(r->headers_out, "Expires", ap_gm_timestr_822(r->pool, 
expires));
   return OK;
   }
  -
  +static void register_hooks(void)
  +{
  +ap_hook_fixups(add_expires,NULL,NULL,HOOK_MIDDLE);
  +}
   module MODULE_VAR_EXPORT expires_module =
   {
  -STANDARD_MODULE_STUFF,
  -NULL,   /* initializer */
  +STANDARD20_MODULE_STUFF,
   create_dir_expires_config,  /* dir config creater */
   merge_expires_dir_configs,  /* dir merger --- default is to override */
   NULL,   /* server config */
   NULL,   /* merge server configs */
   expires_cmds,   /* command table */
   NULL,   /* handlers */
  -NULL,   /* filename translation */
  -NULL,   /* check_user_id */
  -NULL,   /* check auth */
  -NULL,   /* check access */
  -NULL,   /* type_checker */
  -add_expires,/* fixups */
  -NULL,   /* logger */
  -NULL,   /* header parser */
  -NULL,   /* child_init */
  -NULL,   /* child_exit */
  -NULL/* post read-request */
  +register_hooks   /* register hooks */
   };
  
  
  
  1.2   +6 -14 apache-2.0/src/modules/standard/mod_headers.c
  
  Index: mod_headers.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_headers.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mod_headers.c 1999/08/24 06:55:26 1.1
  +++ mod_headers.c 1999/08/30 15:43:48 1.2
  @@ -240,26 +240,18 @@
   
   return DECLINED;
   }
  -
  +static void register_hooks(void)
  +{
  +ap_hook_fixups(fixup_headers,NULL,NULL,HOOK_MIDDLE);
  +} 
   module MODULE_VAR_EXPORT headers_module =
   {
  -STANDARD_MODULE_STUFF,
  -NULL,   /* initializer */
  +STANDARD20_MODULE_STUFF,
   create_headers_dir_config,  /* dir config creater */
   merge_headers_config,   /* dir merger --- default is to override */
   create_headers_config,  /* server config */
   merge_headers_config,   /* merge server configs */
   headers_cmd

cvs commit: apache-2.0/src/lib/apr/inc apr_config.h.in

[rbb]

rbb 99/08/30 08:30:07

  Removed: src/lib/apr/inc apr_config.h.in
  Log:
  This file is in include, and we only need it once.

cvs commit: apache-2.0/src/modules/standard mod_auth_anon.c mod_digest.c

[stoddard]

stoddard99/08/30 08:21:34

  Modified:src  ApacheCore.def
   src/modules/standard mod_auth_anon.c mod_digest.c
  Log:
  Add couple of hooks to the APacheCore.def file. Port mod_auth_anon and 
mod_digest to
  use the new hooks.
  
  Revision  ChangesPath
  1.3   +2 -0  apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApacheCore.def1999/08/27 22:56:35 1.2
  +++ ApacheCore.def1999/08/30 15:21:29 1.3
  @@ -363,3 +363,5 @@
ap_hook_sort_register @358
ap_hook_process_connection @359
ap_process_http_connection @360
  + ap_hook_check_user_id @361
  + ap_hook_auth_checker @362
  
  
  
  1.3   +8 -15 apache-2.0/src/modules/standard/mod_auth_anon.c
  
  Index: mod_auth_anon.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_anon.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_auth_anon.c   1999/08/26 13:57:35 1.2
  +++ mod_auth_anon.c   1999/08/30 15:21:32 1.3
  @@ -288,27 +288,20 @@
   #endif
   return DECLINED;
   }
  -
  +static void register_hooks(void)
  +{
  +
ap_hook_check_user_id(anon_authenticate_basic_user,NULL,NULL,HOOK_MIDDLE);
  +ap_hook_auth_checker(check_anon_access,NULL,NULL,HOOK_MIDDLE);
  +}
   
   module MODULE_VAR_EXPORT anon_auth_module =
   {
  -STANDARD_MODULE_STUFF,
  -NULL,/* initializer */
  -create_anon_auth_dir_config, /* dir config creater */
  +STANDARD20_MODULE_STUFF,
  +create_anon_auth_dir_config,/* dir config creater */
   NULL,/* dir merger ensure strictness */
   NULL,/* server config */
   NULL,/* merge server config */
   anon_auth_cmds,  /* command table */
   NULL,/* handlers */
  -NULL,/* filename translation */
  -anon_authenticate_basic_user,/* check_user_id */
  -check_anon_access,   /* check auth */
  -NULL,/* check access */
  -NULL,/* type_checker */
  -NULL,/* fixups */
  -NULL,/* logger */
  -NULL,/* header parser */
  -NULL,/* child_init */
  -NULL,/* child_exit */
  -NULL /* post read-request */
  +register_hooks   /* register hooks */
   };
  
  
  
  1.3   +7 -14 apache-2.0/src/modules/standard/mod_digest.c
  
  Index: mod_digest.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_digest.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- mod_digest.c  1999/08/26 13:57:36 1.2
  +++ mod_digest.c  1999/08/30 15:21:33 1.3
  @@ -364,26 +364,19 @@
   ap_note_digest_auth_failure(r);
   return AUTH_REQUIRED;
   }
  -
  +static void register_hooks(void)
  +{
  +ap_hook_check_user_id(authenticate_digest_user,NULL,NULL,HOOK_MIDDLE);
  +ap_hook_auth_checker(digest_check_auth,NULL,NULL,HOOK_MIDDLE);
  +}
   module MODULE_VAR_EXPORT digest_module =
   {
  -STANDARD_MODULE_STUFF,
  -NULL,/* initializer */
  +STANDARD20_MODULE_STUFF,
   create_digest_dir_config,/* dir config creater */
   NULL,/* dir merger --- default is to override */
   NULL,/* server config */
   NULL,/* merge server config */
   digest_cmds, /* command table */
   NULL,/* handlers */
  -NULL,/* filename translation */
  -authenticate_digest_user,/* check_user_id */
  -digest_check_auth,   /* check auth */
  -NULL,/* check access */
  -NULL,/* type_checker */
  -NULL,/* fixups */
  -NULL,/* logger */
  -NULL,/* header parser */
  -NULL,/* child_init */
  -NULL,/* child_exit */
  -NULL /* post read-request */
  +register_hooks   /* register hooks */
   };
  
  
  

cvs commit: apache-2.0/src/lib/apr/time/unix time.c

[rbb]

rbb 99/08/30 08:20:16

  Modified:src/lib/apr configure.in
   src/lib/apr/include apr_config.h.in
   src/lib/apr/lib apr_getpass.c
   src/lib/apr/time/unix time.c
  Log:
  More BeOS fixes.
  Submitted by:  David Reid
  
  Revision  ChangesPath
  1.6   +6 -0  apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- configure.in  1999/08/30 14:44:46 1.5
  +++ configure.in  1999/08/30 15:20:01 1.6
  @@ -118,6 +118,7 @@
   dnl Checks for header files.
   AC_HEADER_STDC
   
  +AC_CHECK_HEADERS(conio.h)
   AC_CHECK_HEADERS(crypt.h)
   AC_CHECK_HEADERS(ctype.h)
   AC_CHECK_HEADERS(dir.h)
  @@ -145,6 +146,7 @@
   AC_CHECK_HEADERS(string.h)
   AC_CHECK_HEADERS(sysapi.h)
   AC_CHECK_HEADERS(sysgtime.h)
  +AC_CHECK_HEADERS(termios.h)
   AC_CHECK_HEADERS(time.h)
   AC_CHECK_HEADERS(sys/time.h)
   AC_CHECK_HEADERS(sys/times.h)
  @@ -164,12 +166,14 @@
   AC_CHECK_HEADERS(sys/param.h)
   AC_CHECK_HEADERS(sys/resource.h)
   AC_CHECK_HEADERS(sys/select.h)
  +AC_CHECK_HEADERS(sys/signal.h)
   AC_CHECK_HEADERS(sys/socket.h)
   AC_CHECK_HEADERS(sys/stat.h)
   AC_CHECK_HEADERS(sys/types.h)
   AC_CHECK_HEADERS(sys/wait.h)
   
   AC_CHECK_HEADERS(pthread.h)
  +AC_CHECK_HEADERS(kernel/OS.h)
   
   dnl Checks for typedefs, structures, and compiler characteristics.
   AC_C_CONST
  @@ -193,6 +197,8 @@
   dnl Checks for library functions.
   AC_CHECK_FUNCS(strcasecmp stricmp poll setsid)
   AC_CHECK_FUNCS(sigaction writev)
  +AC_CHECK_FUNC(getpass)
  +AC_CHECK_FUNC(_getch)
   
   dnl Start building stuff from our information
   AC_SUBST(LDLIBS)
  
  
  
  1.5   +6 -0  apache-2.0/src/lib/apr/include/apr_config.h.in
  
  Index: apr_config.h.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_config.h.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_config.h.in   1999/08/19 13:31:10 1.4
  +++ apr_config.h.in   1999/08/30 15:20:06 1.5
  @@ -247,6 +247,9 @@
   /* Define if you have the  header file.  */
   #undef HAVE_SYSGTIME_H
   
  +/* Define if you have the  header file.  */
  +#undef HAVE_TERMIOS_H
  +
   /* Define if you have the  header file.  */
   #undef HAVE_TIME_H
   
  @@ -267,6 +270,9 @@
   
   /* Define if you have the dl library (-ldl).  */
   #undef HAVE_LIBDL
  +
  +/* Define if you have the kernel/OS.h header file (BEOS) */
  +#undef HAVE_KERNEL_OS_H
   
   /* Define if you have the pthread library (-lpthread).  */
   #undef HAVE_LIBPTHREAD
  
  
  
  1.2   +52 -4 apache-2.0/src/lib/apr/lib/apr_getpass.c
  
  Index: apr_getpass.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_getpass.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_getpass.c 1999/08/17 15:59:40 1.1
  +++ apr_getpass.c 1999/08/30 15:20:12 1.2
  @@ -74,6 +74,10 @@
   #include 
   #endif
   
  +#if defined(HAVE_TERMIOS_H) && !defined(HAVE_GETPASS)
  +#include 
  +#endif
  +
   #ifndef CHARSET_EBCDIC
   #define LF 10
   #define CR 13
  @@ -85,8 +89,12 @@
   #define MAX_STRING_LEN 256
   
   #define ERR_OVERFLOW 5
  +
  +#ifndef HAVE_GETPASS
  +
  +/* MPE, Win32 and BeOS all lack a native getpass() */
   
  -#ifdef MPE
  +#if !defined(HAVE_TERMIOS_H) && !defined(WIN32)
   /*
* MPE lacks getpass() and a way to suppress stdin echo.  So for now, just
* issue the prompt and read the results with echo.  (Ugh).
  @@ -106,9 +114,46 @@
   return (char *) &password;
   }
   
  -#endif
  +#elif defined (HAVE_TERMIOS_H)
  +static char *getpass(const char *prompt)
  +{
  +struct termios attr;
  +static char password[MAX_STRING_LEN];
  +int n=0;
  +fputs(prompt, stderr);
  +fflush(stderr);
  + 
  +if (tcgetattr(STDIN_FILENO, &attr) != 0)
  +return NULL;
  + attr.c_lflag &= ~(ECHO);
  +
  + if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &attr) != 0)
  + return NULL;
  +while ((password[n] = getchar()) != '\n') {
  +if (password[n] >= ' ' && password[n] <= '~') {
  +n++;
  +} else {
  +fprintf(stderr,"\n");
  +fputs(prompt, stderr);
  +fflush(stderr);
  +n = 0;
  +}
  +}
  + 
  +password[n] = '\0';
  +fprintf(stderr, "\n");
  +
  +if (n > (MAX_STRING_LEN - 1)) {
  +password[MAX_STRING_LEN - 1] = '\0';
  +}
  +
  +attr.c_lflag |= ECHO;
  +tcsetattr(STDIN_FILENO, TCSANOW, &attr);
  +return (char*) &password;
  +}
  +
  +#else
   
  -#ifdef WIN32
   /*
* Windows lacks getpass().  So we'll re-implement it here.
  

cvs commit: apache-2.0/src/os/win32 apache.ico apache.rc resource.h

[stoddard]

stoddard99/08/30 08:04:31

  Added:   src/os/win32 apache.ico apache.rc resource.h
  Log:
  Lost the Apache feather icon along the way. Adding it back in...
  
  Revision  ChangesPath
  1.1  apache-2.0/src/os/win32/apache.ico
  
<>
  
  
  1.1  apache-2.0/src/os/win32/apache.rc
  
  Index: apache.rc
  ===
  //Microsoft Developer Studio generated resource script.
  //
  #include "resource.h"
  
  #define APSTUDIO_READONLY_SYMBOLS
  /
  //
  // Generated from the TEXTINCLUDE 2 resource.
  //
  #include "winresrc.h"
  
  /
  #undef APSTUDIO_READONLY_SYMBOLS
  
  /
  // Neutral resources
  
  #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
  #ifdef _WIN32
  LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
  #pragma code_page(1252)
  #endif //_WIN32
  
  /
  //
  // Icon
  //
  
  // Icon with lowest ID value placed first to ensure application icon
  // remains consistent on all systems.
  IDI_APACHE  ICONDISCARDABLE "apache.ico"
  #endif// Neutral resources
  /
  
  
  /
  // English (U.K.) resources
  
  #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
  #ifdef _WIN32
  LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
  #pragma code_page(1252)
  #endif //_WIN32
  
  #ifdef APSTUDIO_INVOKED
  /
  //
  // TEXTINCLUDE
  //
  
  1 TEXTINCLUDE DISCARDABLE 
  BEGIN
  "resource.h\0"
  END
  
  2 TEXTINCLUDE DISCARDABLE 
  BEGIN
  "#include ""winresrc.h""\r\n"
  "\0"
  END
  
  3 TEXTINCLUDE DISCARDABLE 
  BEGIN
  "\r\n"
  "\0"
  END
  
  #endif// APSTUDIO_INVOKED
  
  #endif// English (U.K.) resources
  /
  
  
  
  #ifndef APSTUDIO_INVOKED
  /
  //
  // Generated from the TEXTINCLUDE 3 resource.
  //
  
  
  /
  #endif// not APSTUDIO_INVOKED
  
  
  
  
  1.1  apache-2.0/src/os/win32/resource.h
  
  Index: resource.h
  ===
  //{{NO_DEPENDENCIES}}
  // Microsoft Developer Studio generated include file.
  // Used by Apache.rc
  //
  #define IDI_APACHE  101
  
  // Next default values for new objects
  // 
  #ifdef APSTUDIO_INVOKED
  #ifndef APSTUDIO_READONLY_SYMBOLS
  #define _APS_NO_MFC 1
  #define _APS_NEXT_RESOURCE_VALUE102
  #define _APS_NEXT_COMMAND_VALUE 40001
  #define _APS_NEXT_CONTROL_VALUE 1000
  #define _APS_NEXT_SYMED_VALUE   101
  #endif
  #endif
  
  
  

cvs commit: apache-2.0/src/lib/apr/signal/beos Makefile.in signal.c

[rbb]

rbb 99/08/30 08:01:31

  Added:   src/lib/apr/signal/beos Makefile.in signal.c
  Log:
  Signals are now available on Beos.
  Submitted by:  David Reid
  
  Revision  ChangesPath
  1.1  apache-2.0/src/lib/apr/signal/beos/Makefile.in
  
  Index: Makefile.in
  ===
  #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  #LIBS=$(EXTRA_LIBS) $(LIBS1)
  #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ @OPTIM@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ $(LIBS)
  INCDIR=../../include
  INCDIR1=../../../include
  INCDIR2=../../file_io/beos
  INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
  
  LIB=../libsig.a
  
  OBJS=signal.o \
  
  .c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
  
  all: $(LIB)
  
  clean:
$(RM) -f *.o *.a *.so
  
  distclean: clean
-$(RM) -f Makefile
  
  $(OBJS): Makefile
  
  $(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
  
  #
  # We really don't expect end users to use this rule.  It works only with
  # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
  # using it.
  #
  depend:
cp Makefile.in Makefile.in.bak \
&& sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
&& gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
&& sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
> Makefile.in \
&& rm Makefile.new
  
  # DO NOT REMOVE
  signal.o: signal.c ../../../include/apr_general.h \
   $(INCDIR)/apr_config.h ../../../include/apr_errno.h
  
  
  
  1.1  apache-2.0/src/lib/apr/signal/beos/signal.c
  
  Index: signal.c
  ===
  #CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  #LIBS=$(EXTRA_LIBS) $(LIBS1)
  #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES)
  #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
  
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ @OPTIM@
  [EMAIL PROTECTED]@
  [EMAIL PROTECTED]@ $(LIBS)
  INCDIR=../../include
  INCDIR1=../../../include
  INCDIR2=../../file_io/beos
  INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
  
  LIB=../libsig.a
  
  OBJS=signal.o \
  
  .c.o:
$(CC) $(CFLAGS) -c $(INCLUDES) $<
  
  all: $(LIB)
  
  clean:
$(RM) -f *.o *.a *.so
  
  distclean: clean
-$(RM) -f Makefile
  
  $(OBJS): Makefile
  
  $(LIB): $(OBJS)
$(RM) -f $@
$(AR) cr $@ $(OBJS)
$(RANLIB) $@
  
  #
  # We really don't expect end users to use this rule.  It works only with
  # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
  # using it.
  #
  depend:
cp Makefile.in Makefile.in.bak \
&& sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
&& gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
&& sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
   -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
> Makefile.in \
&& rm Makefile.new
  
  # DO NOT REMOVE
  signal.o: signal.c ../../../include/apr_general.h \
   $(INCDIR)/apr_config.h ../../../include/apr_errno.h
  
  
  

cvs commit: apache-2.0/src/lib/apr/signal/beos - New directory

[rbb]

rbb 99/08/30 07:58:42

  apache-2.0/src/lib/apr/signal/beos - New directory

cvs commit: apache-2.0/src/modules/mpm/spmt_os2 spmt_os2.c

[bjh]

bjh 99/08/30 07:47:21

  Modified:src/modules/mpm/spmt_os2 spmt_os2.c
  Log:
  Update OS/2 MPM for latest hooks.
  
  Revision  ChangesPath
  1.10  +0 -3  apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- spmt_os2.c1999/08/13 06:58:02 1.9
  +++ spmt_os2.c1999/08/30 14:47:21 1.10
  @@ -1793,14 +1793,11 @@
   
   module MODULE_VAR_EXPORT mpm_spmt_os2_module = {
   STANDARD20_MODULE_STUFF,
  -NULL,/* child_init */
   NULL,/* create per-directory config structure */
   NULL,/* merge per-directory config structures */
   NULL,/* create per-server config structure */
   NULL,/* merge per-server config structures */
   spmt_os2_cmds,   /* command table */
   NULL,/* handlers */
  -NULL,/* check auth */
  -NULL,/* check access */
   spmt_os2_hooks,  /* register_hooks */
   };
  
  
  

cvs commit: apache-2.0/src/lib/apr configure.in

[bjh]

bjh 99/08/30 07:44:47

  Modified:src/lib/apr configure.in
  Log:
  APR configure.in tweaks to allow test programs to build on OS/2.
  
  Revision  ChangesPath
  1.5   +4 -0  apache-2.0/src/lib/apr/configure.in
  
  Index: configure.in
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- configure.in  1999/08/28 08:05:43 1.4
  +++ configure.in  1999/08/30 14:44:46 1.5
  @@ -79,7 +79,9 @@
   
   case "$OS" in
  *-os2*)
  +   CFLAGS="$CFLAGS -DOS2"
  OSDIR="os2"
  +   LIBPREFIX=""
  ;;
  *beos*)
  OSDIR="beos"
  @@ -91,6 +93,8 @@
   
   AC_CHECK_LIB(dl, dlopen)
   AC_CHECK_LIB(pthread, pthread_mutex_init)
  +AC_CHECK_LIB(socket,socket)
  +AC_CHECK_LIB(ufc,crypt)
   
   if (test "$SYS_SW" = "AIX"); then
   CFLAGS="$CFLAGS -U__STR__"
  
  
  

cvs commit: apache-2.0/src/lib/apr/include apr_portable.h

[bjh]

bjh 99/08/30 07:42:32

  Modified:src/lib/apr/include apr_portable.h
  Log:
  APR OS/2 - add ap_os_* type defines for OS/2.
  
  Revision  ChangesPath
  1.2   +13 -0 apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_portable.h1999/08/17 15:59:37 1.1
  +++ apr_portable.h1999/08/30 14:42:32 1.2
  @@ -95,6 +95,19 @@
   typedef PROCESS_INFORMATION   ap_os_proc_t;
   typedef DWORD ap_os_threadkey_t; 
   typedef SYSTEMTIMEap_os_time_t;
  +
  +#elif defined(OS2)
  +#define INCL_DOS
  +#include 
  +typedef HFILE ap_os_file_t;
  +typedef HDIR  ap_os_dir_t;
  +typedef int   ap_os_sock_t;
  +typedef HMTX  ap_os_lock_t;
  +typedef TID   ap_os_thread_t;
  +typedef PID   ap_os_proc_t;
  +typedef PULONGap_os_threadkey_t; 
  +typedef struct timevalap_os_time_t;
  +
   #else
   /* Any other OS should go above this one.  This is the lowest common
* denominator typedefs for  all UNIX-like systems.  :)
  
  
  

cvs commit: apache-2.0/src/lib/apr/misc/os2 start.c

[bjh]

bjh 99/08/30 07:39:51

  Modified:src/lib/apr/misc/os2 start.c
  Log:
  APR OS/2 startup module:
  - fix parameter to ap_destroy_pool
  - add ap_set_userdata(), ap_get_userdata() and ap_initialize() functions.
  
  Revision  ChangesPath
  1.3   +40 -1 apache-2.0/src/lib/apr/misc/os2/start.c
  
  Index: start.c
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/os2/start.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- start.c   1999/08/27 16:25:51 1.2
  +++ start.c   1999/08/30 14:39:51 1.3
  @@ -97,7 +97,46 @@
   
   ap_status_t ap_destroy_context(struct context_t *cont)
   {
  -ap_destroy_pool(cont->pool);
  +ap_destroy_pool(cont);
   return APR_SUCCESS;
   }
   
  +/* ***APRDOC
  + * ap_status_t ap_set_userdata(ap_context_t *, void *)
  + *Set the data associated with the current context.
  + * arg 1) The current context.
  + * arg 2) The user data associated with the context.
  + */
  +ap_status_t ap_set_userdata(struct context_t *cont, void *data)
  +{
  +if (cont) {
  +cont->prog_data = data;
  +return APR_SUCCESS;
  +}
  +return APR_ENOCONT;
  +}
  +
  +/* ***APRDOC
  + * ap_status_t ap_get_userdata(ap_context_t *, void **)
  + *Return the data associated with the current context.
  + * arg 1) The current context.
  + * arg 2) The user data associated with the context.
  + */
  +ap_status_t ap_get_userdata(struct context_t *cont, void **data)
  +{
  +if (cont) {
  +(*data) = cont->prog_data;
  +return APR_SUCCESS;
  +}
  +return APR_ENOCONT;
  +}
  +
  +/* ***APRDOC
  + * ap_status_t ap_initialize()
  + *Setup any APR internal data structures.  This MUST be the first
  + *function called for any APR program.
  + */
  +ap_status_t ap_initialize(void)
  +{
  +return APR_SUCCESS;
  +}
  
  
  

cvs commit: apache-2.0/src/lib/apr/network_io/unix .sockets.c.swp

[martin]

martin  99/08/30 05:28:14

  Removed: src/lib/apr/network_io/unix .sockets.c.swp
  Log:
  I think this did not belong here.

cvs commit: apache-1.3/conf httpd.conf-dist httpd.conf-dist-win

[martin]

martin  99/08/30 04:43:59

  Modified:conf httpd.conf-dist httpd.conf-dist-win
  Added:   htdocs   index.html.es-ct
  Log:
  Catalan version of the Entry Page, contributed by two colleagues
  of the Siemens Apache Project, Jean-Frédéric Clère and Ignasi Roca.
  
  Submitted by: Jean-Frédéric Clère <[EMAIL PROTECTED]>; Ignasi Roca <[EMAIL 
PROTECTED]>
  
  Revision  ChangesPath
  1.1  apache-1.3/htdocs/index.html.es-ct
  
  Index: index.html.es-ct
  ===
  
  
   
Pàgina de prova de l'instal·lació 
d'Apache
   
  
   

 Funciona !  El servidor web Apache està instal·lat en 
aquest lloc
  !


Si veu aquesta pàgina, es que els propietaris d'aquest domini
acaben d'instal·lar satisfactòriament el
http://www.apache.org/httpd";>servidor web Apache.
Ara han d'afegir contingut en aquest directori i substituir aquesta 
pàgina, 
o bè dirigir aquest servidor cap al contingut real.



 Si està veien aquesta pàgina i no es la que esperava, posis 
en
 contacte  amb
 l'administrador web d'aquest lloc.
 (Provi d'enviar un correu electrònic a 
.)
 Encara que aquest lloc està utilitzant el programari Apache, es 
gairebé segur
 que no tè res a veure amb el Grup Apache, per tant 
 no enviï cap correu electrònic als autors d'Apache referent a 
aquest lloc o al seu contingut.
 Si es que ho fa, el seu missatge serà 
ignorat.



La
documentació
d'Apache ha estat inclosa en aquesta distribució.


L'administrador de web pot utilitzar lliurement la imatge d'aquí sota
en el servidor web equipat amb el programari Apache.
Gràcies per utilitzar Apache !


 

   
  
  
  
  
  1.48  +4 -3  apache-1.3/conf/httpd.conf-dist
  
  Index: httpd.conf-dist
  ===
  RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- httpd.conf-dist   1999/08/29 03:01:26 1.47
  +++ httpd.conf-dist   1999/08/30 11:43:58 1.48
  @@ -646,7 +646,7 @@
   # Danish (da) - Dutch (nl) - English (en) - Estonian (ee)
   # French (fr) - German (de) - Greek-Modern (el)
   # Italian (it) -Portugese (pt) - Luxembourgeois* (ltz)
  -# Spanish (es) - Swedish (sv)
  +# Spanish (es) - Swedish (sv) - Catalan (es-ct)
   #
   AddLanguage da .dk
   AddLanguage nl .nl
  @@ -658,6 +658,7 @@
   AddLanguage it .it
   AddLanguage pt .pt
   AddLanguage ltz .lu
  +AddLanguage es-ct .es-ct
   AddLanguage es .es
   AddLanguage sv .se
   
  @@ -665,9 +666,9 @@
   # in case of a tie during content negotiation.
   #
   # Just list the languages in decreasing order of preference. We have
  -# more or less alphabetized them here. You propably want to change this.
  +# more or less alphabetized them here. You probably want to change this.
   #
  -LanguagePriority en da nl et fr de el it pt ltz es sv
  +LanguagePriority en da nl et fr de el it pt ltz es-ct es sv
   
   #
   # AddType allows you to tweak mime.types without actually editing it, or to
  
  
  
  1.28  +4 -3  apache-1.3/conf/httpd.conf-dist-win
  
  Index: httpd.conf-dist-win
  ===
  RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist-win,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- httpd.conf-dist-win   1999/08/28 10:33:16 1.27
  +++ httpd.conf-dist-win   1999/08/30 11:43:58 1.28
  @@ -583,7 +583,7 @@
   # Danish (da) - Dutch (nl) - English (en) - Estonian (ee)
   # French (fr) - German (de) - Greek-Modern (el)
   # Italian (it) -Portugese (pt) - Luxembourgeois* (ltz)
  -# Spanish (es) - Swedish (sv)
  +# Spanish (es) - Swedish (sv) - Catalan (es-ct)
   #
   AddLanguage da .dk
   AddLanguage nl .nl
  @@ -595,6 +595,7 @@
   AddLanguage it .it
   AddLanguage pt .pt
   AddLanguage ltz .lu
  +AddLanguage es-ct .es-ct
   AddLanguage es .es
   AddLanguage sv .se
   
  @@ -602,9 +603,9 @@
   # in case of a tie during content negotiation.
   #
   # Just list the languages in decreasing order of preference. We have
  -# more or less alphabetized them here. You propably want to change this.
  +# more or less alphabetized them here. You probably want to change this.
   #
  -LanguagePriority en da nl et fr de el it pt ltz es sv
  +LanguagePriority en da nl et fr de el it pt ltz es-ct es sv
   
   #
   # AddType allows you to tweak mime.types without actually editing it, or to
  
  
  

cvs commit: apache-2.0/src CHANGES Configuration.tmpl

[martin]

martin  99/08/30 00:16:53

  Modified:src  CHANGES Configuration.tmpl
  Log:
  it's -> its
  
  Revision  ChangesPath
  1.6   +1 -1  apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CHANGES   1999/08/29 10:43:12 1.5
  +++ CHANGES   1999/08/30 07:16:47 1.6
  @@ -26,7 +26,7 @@
calling order to be specified on a per-hook/per-module basis.
[Ben Laurie]
   
  -  *) Implement mpm_* methods as "modules". Each method gets it's own
  +  *) Implement mpm_* methods as "modules". Each method gets its own
subdir in src/modules (eg: src/modules/prefork). Selection
of method uses Rule MPM_METHOD.  [Jim Jagielski]
   
  
  
  
  1.3   +1 -1  apache-2.0/src/Configuration.tmpl
  
  Index: Configuration.tmpl
  ===
  RCS file: /home/cvs/apache-2.0/src/Configuration.tmpl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Configuration.tmpl1999/08/26 06:20:13 1.2
  +++ Configuration.tmpl1999/08/30 07:16:49 1.3
  @@ -138,7 +138,7 @@
   # For other Rules, the value can be a simple setting. For example,
   # the MPM_METHOD Rule determines the MPM method used. This can either
   # be forced by setting it to a specific value (eg: prefork) or set
  -# to "default" to allow Configure to, as above, make it's best guess
  +# to "default" to allow Configure to, as above, make its best guess
   # as to which is appropriate.
   #
   # SOCKS4: