cvs commit: apache-1.3 STATUS

1998-05-30 Thread jim
jim 98/05/29 17:13:05

  Modified:.STATUS
  Log:
  Update
  
  Revision  ChangesPath
  1.410 +5 -2  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.409
  retrieving revision 1.410
  diff -u -r1.409 -r1.410
  --- STATUS1998/05/29 09:27:21 1.409
  +++ STATUS1998/05/30 00:13:04 1.410
  @@ -2,8 +2,11 @@
   
   Release:
   
  -1.3.0: Shoot for June 1st, 1998 Release
  -   Brian to be RM, Jim will do announcements
  +1.3.0: Current plan is to roll the tarball June 1 (~5pm eastern)
  +   and then release it on the 5th. Jim will roll and tag
  +on the 1st. Everyone should test the tarball so we're
  +sure the tarball is ready for the 5th. Jim will announce
  +as well.
   
   1.3b7: Released 26/5/98.  If no major errors, will become 1.3.0
   
  
  
  


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

1998-05-30 Thread coar
coar98/05/29 18:27:26

  Modified:htdocs/manual/misc FAQ.html
  Log:
Add a note to the FAQ about something that should maybe be added
at some point.  (Hidden in an HTML comment.)
  
  PR:   2300
  
  Revision  ChangesPath
  1.118 +3 -1  apache-1.3/htdocs/manual/misc/FAQ.html
  
  Index: FAQ.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/FAQ.html,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- FAQ.html  1998/05/25 17:35:26 1.117
  +++ FAQ.html  1998/05/30 01:27:25 1.118
  @@ -14,7 +14,7 @@
 !--#include virtual=header.html --
 H1 ALIGN=CENTERApache Server Frequently Asked Questions/H1
 P
  -  $Revision: 1.117 $ ($Date: 1998/05/25 17:35:26 $)
  +  $Revision: 1.118 $ ($Date: 1998/05/30 01:27:25 $)
 /P
 P
 The latest version of this FAQ is always available from the main
  @@ -78,6 +78,8 @@
   !-- - RewriteRule /~fraggle/* /cgi-bin/fraggle.pl does not work--
   !-- - how do I disable authentication for a subdirectory?  --
   !--   (A: you can't but satisfy any; allow from all can be close --
  +!-- - '400 malformed request' on Win32 might mean stale proxy; see --
  +!--   PR #2300.--
   UL
LISTRONGBackground/STRONG
 OL START=1
  
  
  


cvs commit: apache-1.3/src/main util_uri.c

1998-05-30 Thread martin
martin  98/05/29 18:54:30

  Modified:src/main util_uri.c
  Log:
  When unparsing, it is not guaranteed that parsed_uri.path != NULL.
  Act defensively.
  
  Revision  ChangesPath
  1.20  +1 -1  apache-1.3/src/main/util_uri.c
  
  Index: util_uri.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/util_uri.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -u -r1.19 -r1.20
  --- util_uri.c1998/04/11 12:00:32 1.19
  +++ util_uri.c1998/05/30 01:54:30 1.20
  @@ -192,7 +192,7 @@
   /* Append path, query and fragment strings: */
   ret = ap_pstrcat (p,
   ret,
  -uptr-path,
  +uptr-path ? uptr-path : ,
   uptr-query ? ? : ,
   uptr-query ? uptr-query : ,
   uptr-fragment ? # : NULL,
  
  
  


cvs commit: apache-1.3 STATUS

1998-05-30 Thread jim
jim 98/05/30 07:00:31

  Modified:.STATUS
  Log:
  Clarify that we'll be using 1.3b8-dev
  
  Revision  ChangesPath
  1.412 +6 -5  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.411
  retrieving revision 1.412
  diff -u -r1.411 -r1.412
  --- STATUS1998/05/30 11:29:17 1.411
  +++ STATUS1998/05/30 14:00:30 1.412
  @@ -3,12 +3,13 @@
   Release:
   
   1.3.0: Current plan is to roll the tarball June 1 (~5pm eastern)
  -   and then release it on the 5th. Jim will roll and tag
  -on the 1st. Everyone should test the tarball so we're
  -sure the tarball is ready for the 5th. Jim will announce
  -as well.
  +   and then release it on the 5th. The tarball will be the
  +   current CVS tree (1.3b8-dev) as of that date/time.
  +   Jim will roll and tag on the 1st. Everyone should test
  +   the tarball so we're sure the tarball is ready for the 5th.
  +   Jim will announce as well.
   
  -1.3b7: Released 26/5/98.  If no major errors, will become 1.3.0
  +1.3b7: Tagged and Released 26/5/98.
   
   2.0  : In pre-alpha development, see apache-2.0 repository
   
  
  
  


cvs commit: apache-site/info known_bugs.html

1998-05-30 Thread pcs
pcs 98/05/30 07:29:51

  Modified:info known_bugs.html
  Log:
  Add a couple of important 1.3b7 bugs
  
  Revision  ChangesPath
  1.9   +27 -0 apache-site/info/known_bugs.html
  
  Index: known_bugs.html
  ===
  RCS file: /export/home/cvs/apache-site/info/known_bugs.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- known_bugs.html   1998/05/27 20:58:50 1.8
  +++ known_bugs.html   1998/05/30 14:29:51 1.9
  @@ -35,6 +35,33 @@
   problems/A./P
   HR
   
  +H2Apache 1.3b7 Bugs/H2
  +
  +OL
  +LISTRONGWin32 only/STRONG CGI scripts do not work because of two
  +problems. First, the CGI environment variables are not being
  +passed on to the script. See A
  +HREF=http://bugs.apache.org/index/full/2294;PR#2294/A for more
  +details.  Secondly, the current working directory of the script
  +is not being set, which affected scripts which relied on the
  +directory being set to the directory containg the CGI program
  +itself (although this is not a requirement of the CGI/1.1
  +specification). See A
  +HREF=http://bugs.apache.org/index/full/2317;PR#2317/A for more
  +details.
  +
  +LIThe $ character inside an SSI directive is not being correctly 
  +interpreted unless it marked the start of a variable. In
  +particular, it does not work for marking the end of line in a
  +regular expression.  See A
  +HREF=http://bugs.apache.org/index/full/1921;PR#1921/A and A
  +HREF=http://bugs.apache.org/index/full/2249;PR#2249/A for more
  +details
  +
  +
  +
  +/OL
  +
   H2Apache 1.3b5 Bugs/H2
   
   OL
  
  
  


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

1998-05-30 Thread pcs
pcs 98/05/30 07:46:50

  Modified:conf access.conf-dist-win httpd.conf-dist-win
srm.conf-dist-win
  Log:
  Replace some absolute paths with @@ServerRoot@@ so they get expanded
  correctly at install time, like the Unix configuration files.
  
  Revision  ChangesPath
  1.6   +2 -2  apache-1.3/conf/access.conf-dist-win
  
  Index: access.conf-dist-win
  ===
  RCS file: /export/home/cvs/apache-1.3/conf/access.conf-dist-win,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- access.conf-dist-win  1998/05/29 01:31:32 1.5
  +++ access.conf-dist-win  1998/05/30 14:46:49 1.6
  @@ -53,10 +53,10 @@
   
   /Directory
   
  -# /apache/cgi-bin should be changed to whatever your ScriptAliased
  +# @@ServerRoot@@/cgi-bin should be changed to whatever your ScriptAliased
   # CGI directory exists, if you have that configured.
   
  -Directory /apache/cgi-bin
  +Directory @@ServerRoot@@/cgi-bin
   AllowOverride None
   Options None
   /Directory
  
  
  
  1.14  +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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- httpd.conf-dist-win   1998/05/21 18:50:58 1.13
  +++ httpd.conf-dist-win   1998/05/30 14:46:49 1.14
  @@ -5,13 +5,13 @@
   # what they do, if you are unsure consult the online docs. You have been
   # warned.  
   
  +# Originally by Rob McCool
  +
   # Note: Where filenames are specified, you must use forward slashes
   # instead of backslashes. e.g. c:/apache instead of c:\apache. If
   # the drive letter is ommited, the drive where Apache.exe is located
   # will be assumed
   
  -# Originally by Rob McCool
  -
   # ServerType must be standalone.
   
   ServerType standalone
  @@ -42,6 +42,7 @@
   #   e.g.   www.apache.org (on) or 204.62.129.132 (off)
   # The default is off because it'd be overall better for the net if people
   # had to knowingly turn this feature on.
  +
   HostnameLookups off
   
   # If you wish httpd to run as a different user or group, you must run
  @@ -183,7 +184,7 @@
   
   # To enable the cache as well, edit and uncomment the following lines:
   
  -#CacheRoot /usr/local/apache/proxy
  +#CacheRoot @@ServerRoot@@/proxy
   #CacheSize 5
   #CacheGcInterval 4
   #CacheMaxExpire 24
  
  
  
  1.11  +2 -2  apache-1.3/conf/srm.conf-dist-win
  
  Index: srm.conf-dist-win
  ===
  RCS file: /export/home/cvs/apache-1.3/conf/srm.conf-dist-win,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- srm.conf-dist-win 1998/05/21 18:01:59 1.10
  +++ srm.conf-dist-win 1998/05/30 14:46:49 1.11
  @@ -143,12 +143,12 @@
   # require it to be present in the URL.  So /icons isn't aliased in this
   # example.
   
  -Alias /icons/ /apache/icons/
  +Alias /icons/ @@ServerRoot@@/icons/
   
   # ScriptAlias: This controls which directories contain server scripts.
   # Format: ScriptAlias fakename realname
   
  -#ScriptAlias /cgi-bin/ /apache/cgi-bin/
  +#ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/
   
   # If you want to use server side includes, or CGI outside
   # ScriptAliased directories, uncomment the following lines.
  
  
  


cvs commit: apache-devsite how-to-release-win32.html

1998-05-30 Thread pcs
pcs 98/05/30 08:26:31

  Modified:.how-to-release-win32.html
  Log:
  Add some more detail on how to release on Windows, in the light of
  experience building IS2 configurations. Be more explicit about where
  the files come from (i.e. a tagged released), line ending conversion,
  re-committing the IS2 configuration, registry keys, and building
  binaries in a different directory.
  
  Revision  ChangesPath
  1.6   +71 -30apache-devsite/how-to-release-win32.html
  
  Index: how-to-release-win32.html
  ===
  RCS file: /export/home/cvs/apache-devsite/how-to-release-win32.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- how-to-release-win32.html 1998/05/04 08:43:43 1.5
  +++ how-to-release-win32.html 1998/05/30 15:26:30 1.6
  @@ -69,12 +69,18 @@
   
   P
   
  -Now create the install directory. Copy the Apache distribution to this
  -directory (make sure that the files have the correct DOS line endings
  -first). Some of the directories and files are not needed on Windows,
  -so now delete:
  +Now create the install directory, and extract Apache into it.  The
  +Apache files will normally come either direct from CVS at a given tag
  +value, or from an existing Unix source distribution. If the
  +distribution has Unix line endings, convert the line endings of all
  +files apart from SAMPhtdocs/*.gif/SAMP and
  +SAMPicons/*.gif/SAMP.
  +
   P
   
  +The following directories are not needed on Windows because they
  +are not part of the installer:
  +
   UL
LISAMPconf\*.conf-dist/SAMP (but leave the 
SAMP*.conf-dist-win/SAMP)
LISAMPsrc\os\{emx,bs2000,unix}/SAMP
  @@ -83,24 +89,39 @@
LISAMPsrc\modules\test/SAMP
   /UL
   
  +P
  +
   (Note: the InstallShield configuration file lists only the files which
  -are to be build into the installer, so it is no necessary to remove
  +are to be build into the installer, so it is not necessary to remove
   these files and directories unless you are planning to update the IS
   configuration by dragging-and-dropping directories).
   
   P
   
  +You will also need to build the executables and DLLs. This should
  +STRONGnot/STRONG be done in the same directory where you are
  +building the installer. Instead, copy your install directory to a
  +temporary directory name (this can be any directory, but the examples
  +below will assume that it is SAMPC:\BUILD/SAMP).
  +
  +P
  +
   Copy the SAMPMSVCRT.DLL/SAMP file into the install directory. This
   file can be found on the MSVC++ 5.0 CD (it is a redistributable file),
   or in the SAMP\WINDOWS\SYSTEM/SAMP (Win95) or
   SAMP\WINNT\SYSTEM32/SAMP (WinNT) directories.
   
  +PRE
  +  COPY \WINDOWS\SYSTEM\MSVCRT.DLL \Apache  I(Windows 95)/I
  +  COPY \WINNT\SYSTEM32\MSVCRT.DLL \Apache  I(Windows NT)/I
  +/PRE
  +
   P
   
   LISTRONGConfigure the InstallShield Configuration File/STRONGP
   
  -Apache for Windows is packaged using InstallShield 2. This requires an
  -InstallShield configuration file
  +Apache for Windows is packaged using InstallShield 2. This use the
  +configuration file
   SAMPos/win32/installer/apache.iwz/SAMP. Unfortunately
   InstallShield's configuration file contains hard-coded absolute paths
   to the individual files. If your install directory (step 1) is
  @@ -117,35 +138,55 @@
   
   P
   
  +Start InstallShield 2, then load the
  +SAMPos/win32/installer/apache.iwz/SAMP file from the build
  +directory (e.g. SAMP\BUILD/SAMP). Inside InstallShield, perform
  +the following actions:
  +
  +P
  +
   UL
   
  + LICheck that STRONGall/STRONG the components contain the correct
  + list of files. This is a case of manually comparing the list of
  + files in each component with the corresponding directory under
  + your install directory (this is a repeatative and boring process,
  + but InstallShield cannot handle betters ways of specific multiple
  + files or directories to include in a single step). You will need to
  + add or remove any files added or removed since the last time the
  + configuration file was updated (NB: certain Unix only files
  + may not need to be added, if they are not needed by Windows
  + end users).
  + /LI
LISet the Visual Design, Application Information, Version. This
  - should contain the full version number, eg. 1.3 or 1.3b5.
  + should contain the full version number, eg. 1.3.0 or 1.3b5.
/LI
LISet the Visual Design, Main Window, Main Title. As above.
/LI
  - LIMake Registry Changes, Registry Keys. The key
  + LIEnsure that the correct registry key will be used.
  + Go to Make Registry Changes, Registry Keys. The key
HKLM\SOFTWARE\Apache Group\Apache should contain a subkey
containing the version number which does not change across beta
  - release. For example, 1.3 (for a full release) or 1.3 beta
  + release. For example, 1.3.0 (for a 

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

1998-05-30 Thread dgaudet
dgaudet 98/05/30 12:15:39

  Modified:src  CHANGES
   src/modules/standard mod_negotiation.c
  Log:
  Using a type map file as a custom error document was not possible.
  
  PR:   1031
  Submitted by: Lars Eilebrecht
  
  Revision  ChangesPath
  1.879 +3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.878
  retrieving revision 1.879
  diff -u -r1.878 -r1.879
  --- CHANGES   1998/05/29 20:45:53 1.878
  +++ CHANGES   1998/05/30 19:15:37 1.879
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3b8
   
  +  *) Using a type map file as a custom error document was not possible.
  + [Lars Eilebrecht] PR#1031
  +
 *) Avoid problems with braindead Awks by additionally searching for gawk 
and nawk in APACI's configure script.
[Dave Dykstra [EMAIL PROTECTED], Ralf S. Engelschall] PR#2319
  
  
  
  1.80  +3 -3  apache-1.3/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.79
  retrieving revision 1.80
  diff -u -r1.79 -r1.80
  --- mod_negotiation.c 1998/05/04 06:58:09 1.79
  +++ mod_negotiation.c 1998/05/30 19:15:38 1.80
  @@ -711,9 +711,6 @@
   /* We are not using multiviews */
   neg-count_multiviews_variants = 0;
   
  -if (rr-status != HTTP_OK) {
  -return rr-status;
  -}
   map = ap_pfopen(neg-pool, rr-filename, r);
   if (map == NULL) {
   ap_log_error(APLOG_MARK, APLOG_ERR, r-server,
  @@ -854,6 +851,9 @@
   
   ap_pclosedir(neg-pool, dirp);
   neg-avail_vars-nelts = 0;
  + if (sub_req-status != HTTP_OK) {
  + return sub_req-status;
  + }
   return read_type_map(neg, sub_req);
   }