httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r239612 - in /httpd/httpd/branches/mod_version_for_2.0.x: ./ docs/manual/ docs/manual/howto/ modules/experimental/ modules/http/ modules/proxy/ server/ srclib/
Date Wed, 24 Aug 2005 11:52:12 GMT
Author: nd
Date: Wed Aug 24 04:51:40 2005
New Revision: 239612

URL: http://svn.apache.org/viewcvs?rev=239612&view=rev
Log:
mod_version_for_2.0.x branch:
* Merge 219658 to 239611 from branches/2.0.x


Added:
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.es   (props changed)
      - copied unchanged from r239611, httpd/httpd/branches/2.0.x/docs/manual/howto/auth.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.xml.es   (props changed)
      - copied unchanged from r239611, httpd/httpd/branches/2.0.x/docs/manual/howto/auth.xml.es
Modified:
    httpd/httpd/branches/mod_version_for_2.0.x/CHANGES   (contents, props changed)
    httpd/httpd/branches/mod_version_for_2.0.x/STATUS
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ja.euc-jp
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ko.euc-kr
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.xml.meta
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ja
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.meta
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ru
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ja
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.meta
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ru
    httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap.c
    httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache.c
    httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache_mgr.c
    httpd/httpd/branches/mod_version_for_2.0.x/modules/http/http_protocol.c
    httpd/httpd/branches/mod_version_for_2.0.x/modules/proxy/proxy_util.c
    httpd/httpd/branches/mod_version_for_2.0.x/server/log.c
    httpd/httpd/branches/mod_version_for_2.0.x/srclib/   (props changed)

Modified: httpd/httpd/branches/mod_version_for_2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/CHANGES?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/CHANGES [iso-8859-1] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/CHANGES [utf-8] Wed Aug 24 04:51:40 2005
@@ -1,11 +1,29 @@
+                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.0.55
 
   *) Added new module mod_version, which provides version dependent
-     configuration containers.  [André Malo]
+     configuration containers.  [Andr�alo]
 
   *) Add core version query function (ap_get_server_revision) and
      accompanying ap_version_t structure (minor MMN bump).
-     [André Malo]
+     [Andr�alo]
+
+  *) Fix cases where the byterange filter would buffer responses
+     into memory.  PR 29962.  [Joe Orton]
+
+  *) mod_proxy: Fix over-eager handling of '%' for reverse proxies.
+     PR 15207.  [Jim Jagielski]
+
+  *) mod_ldap: Fix various shared memory cache handling bugs.
+     PR 34209.  [Joe Orton]
+
+  *) Fix a file descriptor leak when starting piped loggers.  PR 33748. 
+     [Joe Orton]
+
+  *) mod_ldap: Avoid segfaults when opening connections if using a version
+     of OpenLDAP older than 2.2.21.  PR 34618.  [Brad Nicholes]
+
+  *) mod_ssl: Fix build with OpenSSL 0.9.8.  PR 35757.  [William Rowe]
 
   *) SECURITY: CAN-2005-2088
      core: If a request contains both Transfer-Encoding and Content-Length
@@ -42,14 +60,14 @@
 Changes with Apache 2.0.54
 
   *) mod_cache: Add CacheIgnoreHeaders directive.  PR 30399.
-     [Rüiger Plü <r.pluem t-online.de>]
+     [Rüdiger Plüm <r.pluem t-online.de>]
 
   *) mod_ldap: Added the directive LDAPConnectionTimeout to configure
      the ldap socket connection timeout value.  
      [Brad Nicholes]
 
   *) Correctly export all mod_dav public functions.
-     [Branko Èibej <brane xbc.nu>]
+     [Branko Čibej <brane xbc.nu>]
 
   *) Add a build script to create a solaris package. [Graham Leggett]
 
@@ -183,10 +201,10 @@
      PR 31036. [André Malo]
 
   *) mod_disk_cache: Do not store aborted content.  PR 21492.
-     [Rüiger Plü <r.pluem t-online.de>]
+     [Rüdiger Plüm <r.pluem t-online.de>]
 
   *) mod_disk_cache: Correctly store cached content type.  PR 30278.
-     [Rüiger Plü <r.pluem t-online.de>]
+     [Rüdiger Plüm <r.pluem t-online.de>]
 
   *) mod_ldap: prevent the possiblity of an infinite loop in the LDAP
      statistics display. PR 29216. [Graham Leggett]
@@ -846,7 +864,7 @@
   *) mod_expires: Initialize ExpiresDefault to NULL instead of "" to
      avoid reporting an Internal Server error if it is used without
      having been set in the httpd.conf file. PR: 23748, 24459
-     [Andre Malo, Liam Quinn  <liam htmlhelp.com>]
+     [André Malo, Liam Quinn  <liam htmlhelp.com>]
 
   *) mod_autoindex: Don't omit the <tr> start tag if the SuppressIcon
      option is set. PR 21668.  [Jesse Tie-Ten-Quee <highos highos.com>]
@@ -1563,7 +1581,7 @@
      [Frederic DONNAT <frederic.donnat zencod.com>]
 
   *) Always emit Vary header if mod_deflate is involved in the
-     request.  [Andre Malo <nd perlig.de>]
+     request.  [André Malo <nd perlig.de>]
 
   *) mod_isapi: Stop unsetting the 'empty' query string result with
      a NULL argument in ecb->lpszQueryString, eliminating segfaults
@@ -5429,7 +5447,7 @@
      but APR needs the check too, and I suspect other applications will
      as well.  APR now defines APR_INADDR_NONE, which is always a valid
      value on all platforms.
-     [Branko Èibej <brane xbc.nu>]
+     [Branko Čibej <brane xbc.nu>]
 
   *) Destroy the pthread mutex in lock_intra_cleanup() for PR#6824.
      [Shuichi Kitaguchi <ki hh.iij4u.or.jp>] 
@@ -5587,7 +5605,7 @@
      [Ryan Bloom]
 
   *) apr_psprintf doesn't understand %lld as a format.  Make it %ld.
-     [Tomas "Ögren" <stric ing.umu.se>]
+     [Tomas Ögren <stric ing.umu.se>]
 
   *) APR pipes on Unix and Win32 are now cleaned up automatically when the 
      associated pool goes away.  (APR pipes on OS/2 were already had this
@@ -5795,11 +5813,11 @@
       -cache result for "struct rlimit"
       -compile all helper programs with native and cross compiler
        and use the native version to generate header file
-     ["Rüdiger" Kuhlmann <Tadu gmx.de>]
+     [Rüdiger Kuhlmann <Tadu gmx.de>]
 
   *) Prepare our autoconf setup for autoconf 2.14a and for cross-
      compiling.
-     ["Rüdiger" Kuhlmann <Tadu gmx.de>]
+     [Rüdiger Kuhlmann <Tadu gmx.de>]
 
   *) Fix a bug where a client which only sends \n to delimit header
      lines (netcat) gets a strange looking HTTP_NOT_IMPLEMENTED 
@@ -10873,7 +10891,7 @@
      handle multiple Listen directives.  [Marc Slemko] PR#872
 
   *) Inherit a bugfix to fnmatch.c from FreeBSD sources.
-     ["[KOI8-R] áÎÄÒÅÊ þÅÒÎÏ×" <ache nagual.pp.ru>] PR#1311
+     [Андрей Чернов <ache nagual.pp.ru>] PR#1311
 
   *) When a configuration parse complained about a bad directive,
      the logger would use whatever (unrelated) value was in errno.

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/CHANGES
------------------------------------------------------------------------------
    svnmailer:content-charset = utf-8

Modified: httpd/httpd/branches/mod_version_for_2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/STATUS?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/STATUS (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/STATUS Wed Aug 24 04:51:40 2005
@@ -104,91 +104,33 @@
 
 RELEASE SHOWSTOPPERS:
 
-    * Various fixes to T-E and C-L processing from trunk
-
-      Refactor mod_proxy_http.c's Transfer-Encoding/Content-Length elections
-      since they didn't follow RFC 2616, in fact didn't seem to make much
-      sense at all.  Patch to migrate request-body-handling from trunk/ based
-      on 2.1-dev request body handling behavior (although just a bit more
-      conservative on the side of C-L spooling)...
-          http://people.apache.org/~wrowe/httpd-2.0-proxy-request-3.patch
-      Revert r219061 to properly test this patch, as r219061 masks the
-      underlying bug (although it is a -good- patch in and of itself).
+    * Copy the backport branch of all of the mod_proxy_http.c's request body 
+      handling security, protocol and bug fixes; by svn copy'ing the file
+      httpd/httpd/branches/proxy-reqbody-2.0.x/modules/proxy/proxy_http.c back to
+      httpd/branches/2.0.x/... preserving the detail of all of the individually
+      backported changes.
 
        +1: wrowe, jim
-       -1: jorton: this is a massive patch and extremely hard to review
-           for actual interesting content; it is mixed in with all sorts
-           of unrelated stuff.  It needs to at least be split up or
-           the unrelated stuff removed.
-
-           unrelated change: s/apr_strnatcasecmp/strcasecmp/
-           unrelated change: s/b/bb/ on variable+parameter names a few times
-           unrelated change: whitespaces changes all over the shop
-           spurious change:? send_request_body() appears to have been inlined
-           unrelated change: Via header handling
-
-         trawick noted on list: we elected C-L not for efficiency, but because
-                 it's the most widely supported [paraphrasing]
-         wrowe   notes: I agree - this new patch always chooses C-L for any
-                 C-L body received.  If the origin kicks out LENGTH_REQUIRED
-                 for a T-E body it's always up to the client to react.
-                 Note proxy-sendchunks can override this behavior.
-         roy     Notes on list: we must always prefer C-L if it's going to fit
-                 in our brigade.
-         wrowe   good point; the revised patch prereads MAX_MEM_SPOOL and will
-                 try reading that before choosing C-L or T-E.
-         wrowe   adds; After testing, I've determined one brigade isn't enough,
-                 so I've extended this to a loop up to MAX_MEM_SPOOL, we will
-                 fetch up enough body to fill MAX_MEM_SPOOL and hopefully
-                 hit the C-L code path most of the time.
-
-         trawick We are counting bytes in stream_reqbody_cl but filters can
-                 change the size? [p]
-         wrowe   Yes - which is why the patch prefers spool_reqbody_cl unless
-                 the filter stack is unchanged from proto_input_filters.  The
-                 protocol filters shouldn't be changing content size.  And when
-                 it happens, we have to barf or we have a split request.
-                 The old behavior was worse; we would stream the request body
-                 in additional cases without looking to see if the byte count
-                 matched Content-Length.  Easy opportunity for split requests.
-
-         trawick What specifically was done for conformance to RFC 2616? [p]
-         wrowe   Elect the appropriate body handling, and ensure that body
-                 request contains the required *single* T-E or C-L header,
-                 and there are far few code paths to stream_reqbody_cl which
-                 was most likely to create split requests by reporting the
-                 wrong C-L.
-
-         trawick Please split philosophy from rfc violations from security 
-                 fixes in the CHANGES log? [p]
-         wrowe   The others are all a bit to intertwined, the Watchfire report 
-                 spelled out that it's different behavior and RFC 2616 deviations 
-                 that cause the vulnerability, so I don't see how we can divide 
-                 the issues of correctly sending the body and choosing the
-                 transport flavor.
+       -1:
+
+      For a complete history of individual unit changes, see r230703 - r230744 in
+      http://svn.apache.org/viewcvs.cgi/httpd/httpd/branches/proxy-reqbody-2.0.x/
+      [...]  modules/proxy/proxy_http.c?&view=log
+      Cite the specific patch with justification for each specific objection.
+
+      Suggested; revert r219061 to thoroughly test this patch, as r219061 masks 
+      some underlying bugs (although it is a -good- patch in and of itself and
+      provides additional protection to other content-handling modules).      
+
+    * TRACE must not have a request body per RFC2616; see the -trace.patch
+      below for one of two alternatives.  The other alternative; simply
+      hack mod_proxy.c to reject TRACE when a body is seen, again see that
+      -trace.patch for an illustration.
 
 
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ please append new backports at the end of this list not the top. ]
 
-    *) ap_proxy_canonenc() is over-eager in handling '%' for reverse
-       proxies (PR: 29554).
-         Index: modules/proxy/proxy_util.c
-             -       if (isenc && ch == '%') {
-             +       if (isenc && (isenc != PROXYREQ_REVERSE) && ch == '%') {
-
-       +1: jim, pquerna, wrowe
-
-    *) Fix fd leak in piped logging code, fix error handling, and remove
-       dead errno handling.
-         http://svn.apache.org/viewcvs?rev=170441&view=rev
-         http://svn.apache.org/viewcvs?rev=170537&view=rev
-         http://svn.apache.org/viewcvs?rev=170719&view=rev
-       all-in-one patch incremental to the PR 26467 fix:
-         http://people.apache.org/~jorton/ap_pipedlog2.diff
-       +1: jorton, trawick, wrowe
-       [yes, I will write a CHANGES entry too]
-
     *) several changes to improve logging of connection-oriented errors, including
        ap_log_cerror() API (needs minor bump in addition to changes below)
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.289&r2=1.291
@@ -253,11 +195,38 @@
       Votes from before the integration branch:
           +1: jerenkrantz, wrowe (trivial, would even be cool in 1.3)
 
+     *) proxy FTP: Fix confusion about globbing characters which could lead
+        to getting a directory listing when a file was requested.  PR 34512.
+        2.1 patch was http://svn.apache.org/viewcvs?rev=179704&view=rev
+        2.0 version: http://people.apache.org/~trawick/179704-20.txt
+        +1: trawick, jorton, wrowe
+
+    *) Prevent bad dereferencing of non-existent req struct in
+       mod_auth_ldap's mod_auth_ldap_auth_checker() if
+       mod_auth_ldap_check_user_id() was never (fully) called.
+       Similar behavior to that in 2.1/2.2.
+         http://people.apache.org/~jim/mod_auth_ldap-2.0.patch
+       +1: jim, minfrin, bnicholes
+
+     *) Add httxt2dbm for creating RewriteMap DBM Files.
+        http://svn.apache.org/viewcvs.cgi?rev=209539&view=rev
+        +1: pquerna, jorton, trawick
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are! ]
 
+    *) Fix CAN-2005-2491, integer overflow in pcre.
+         http://svn.apache.org/viewcvs?rev=233493&view=rev
+       rediff for 2.0: http://people.apache.org/~jorton/CAN-2005-2491.patch
+       test case: perl-framework/t/security/CAN-2005-2491.t
+       +1: jorton, nd
+
+    *) Remove the base href tag from mod_proxy_ftp, as it breaks relative
+       links for clients not using an Authorization header.
+         modules/proxy/mod_proxy_ftp.c: r231044
+       +1: minfrin, jim, nd
+
     *) Correct RFC 2616 non-compliance by refusing to proxy a request body 
        in a TRACE request, unless TraceEnable extended is configured.
        Introduces TraceEnable [on|off|extended] to give the administrator
@@ -325,23 +294,21 @@
         http://svn.apache.org/viewcvs?rev=178262&view=rev
         (With 2.0.x it is the same code in the same function, but in 
         a different source file.)
-        +1: trawick
+        +1: trawick, wrowe, nd
 
      *) Support the suppress-error-charset setting, as with Apache 1.3.x.
         PR 31274. (current docs say it works with Apache from 2.0.40 ;) )
         http://svn.apache.org/viewcvs?rev=170354&view=rev
-        +1: trawick, jorton
-
-     *) proxy FTP: Fix confusion about globbing characters which could lead
-        to getting a directory listing when a file was requested.  PR 34512.
-        2.1 patch was http://svn.apache.org/viewcvs?rev=179704&view=rev
-        2.0 version: http://people.apache.org/~trawick/179704-20.txt
-        +1: trawick, jorton
+        +1: trawick, jorton, nd
 
      *) mod_mime_magic: Handle CRLF-format magic files so that it works with
         the default installation on Windows. 
         http://svn.apache.org/viewcvs?rev=179622&view=rev
-        +1: trawick
+        +1: trawick, wrowe
+        wrowe asks: is it possible to simply strip trailing whitespace instead
+                    of special handling for the end of line characters?  
+                    Seems more portable.
+        trawick says: makes sense; searching for bandwidth
 
      *) mod_cache: Fix handling of 'Vary: *". PR 16125.
         Trunk: r180341
@@ -357,16 +324,20 @@
         includes.
         http://svn.apache.org/viewcvs?rev=179763&view=rev
         2.0.x patch: http://people.apache.org/~jorton/ap_pr12655.patch
+        test case in perl-framework/t/modules/include.t
         PR: 12655
-        +1: jorton
+        +1: jorton, nd
 
      *) mod_auth_digest: Fix hostinfo validation for CONNECT requests.
         http://svn.apache.org/viewcvs.cgi?rev=193127&view=rev
-        +1: jorton
+        +1: jorton, nd
 
-     *) Add httxt2dbm for creating RewriteMap DBM Files.
-        http://svn.apache.org/viewcvs.cgi?rev=209539&view=rev
-        +1: pquerna
+     *) Reverse Proxy fixes: <Location> bug and Cookie support
+        Patch is at
+        http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=112365629308138&q=p4
+        and is in production with Clients.
+        +1: niq, nd
+          niq: I'm seeing *a lot* of demand for this.
 
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
@@ -516,9 +487,6 @@
 
 
 CURRENT VOTES:
-
-    * Reverse proxy cookie patch from PR#10722 (c.f. comment 16)
-      +1: niq
 
     * Promote mod_ldap and mod_auth_ldap from experimental to
       non experimental status.

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.html.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.html.es?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.html.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.html.es Wed Aug 24 04:51:40 2005
@@ -47,8 +47,8 @@
     
 
     <div class="example"><p><code>
-      &lt;VirtualHost www.abc.com&gt; <br />
-      ServerAdmin webgirl@abc.com <br />
+      &lt;VirtualHost www.abc.dom&gt; <br />
+      ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
     </code></p></div>
@@ -60,7 +60,7 @@
     responderá a las peticiones que se produzcan. El ejemplo
     mostrado arriba no incluye la direccion IP, de manera que Apache
     tiene que usar una resolución DNS para encontrar la
-    dirección IP correspondiente a <code>www.abc.com</code>. Si
+    dirección IP correspondiente a <code>www.abc.dom</code>. Si
     por alguna razón la resolución DNS no está
     disponible en el momento en que su servidor está analizando
     sintánticamente su fichero de configuración, entonces
@@ -69,12 +69,12 @@
     hagan a ese host virtual (en las versiones de Apache anteriores a
     la 1.2 el servidor ni siquiera se iniciaba).</p>
 
-    <p>Suponga que <code>www.abc.com</code> tiene como dirección
+    <p>Suponga que <code>www.abc.dom</code> tiene como dirección
     IP la 10.0.0.1. Considere la siguiente configuración:</p>
 
     <div class="example"><p><code>
       &lt;VirtualHost 10.0.0.1&gt; <br />
-      ServerAdmin webgirl@abc.com <br />
+      ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
     </code></p></div>
@@ -95,8 +95,8 @@
 
     <div class="example"><p><code>
       &lt;VirtualHost 10.0.0.1&gt; <br />
-      ServerName www.abc.com <br />
-      ServerAdmin webgirl@abc.com <br />
+      ServerName www.abc.dom <br />
+      ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
     </code></p></div>
@@ -111,17 +111,17 @@
     de las dos búsquedas de DNS mencionadas arriba falla para
     cualquiera de sus hosts virtuales. En algunos casos estas
     búsquedas DNS puede que no estén bajo su control; por
-    ejemplo, si <code>abc.com</code> es uno de sus clientes y ellos
+    ejemplo, si <code>abc.dom</code> es uno de sus clientes y ellos
     controlan su propia DNS, pueden forzar a su servidor (pre-1.2) a
     fallar al iniciarse simplemente borrando el registro
-    <code>www.abc.com</code>.</p>
+    <code>www.abc.dom</code>.</p>
 
     <p>Otra formas pueden ser bastante más complicadas. Fíjese
     en esta configuración:</p>
 
     <div class="example"><p><code>
-      &lt;VirtualHost www.abc.com&gt; <br />
-      &nbsp;&nbsp;ServerAdmin webgirl@abc.com <br />
+      &lt;VirtualHost www.abc.dom&gt; <br />
+      &nbsp;&nbsp;ServerAdmin webgirl@abc.dom <br />
       &nbsp;&nbsp;DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt; <br />
       <br />
@@ -132,19 +132,19 @@
     </code></p></div>
 
     <p>Suponga que ha asignado la dirección 10.0.0.1 a
-    <code>www.abc.com</code> y 10.0.0.2 a
+    <code>www.abc.dom</code> y 10.0.0.2 a
     <code>www.def.com</code>. Todavía más, suponga que
     <code>def.com</code> tiene el control de sus propias DNS. Con esta
     configuración ha puesto <code>def.com</code> en una
     posición en la que puede robar todo el trafico destinado a
-    <code>abc.com</code>. Para conseguirlo, todo lo que tiene que
+    <code>abc.dom</code>. Para conseguirlo, todo lo que tiene que
     hacer es asignarle a <code>www.def.com</code> la dirección
     10.0.0.1. Como ellos controlan sus propias DNS no puede evitar que
     apunten el registro <code>www.def.com</code> a donde quieran.</p>
 
     <p>Las peticiones dirigidas a la dirección 10.0.0.1
     (incluídas aquellas en las los usuarios escriben URLs de tipo
-    <code>http://www.abc.com/whatever</code>) serán todas
+    <code>http://www.abc.dom/whatever</code>) serán todas
     servidas por el host virtual <code>def.com</code>. Comprender por
     qué ocurre esto requiere una discusión más profunda
     acerca de como Apache asigna las peticiones que recibe a los hosts

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.xml.es?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.xml.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/dns-caveats.xml.es Wed Aug 24 04:51:40 2005
@@ -40,8 +40,8 @@
     <title>Un ejemplo sencillo</title>
 
     <example>
-      &lt;VirtualHost www.abc.com&gt; <br />
-      ServerAdmin webgirl@abc.com <br />
+      &lt;VirtualHost www.abc.dom&gt; <br />
+      ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
     </example>
@@ -53,7 +53,7 @@
     responder&#225; a las peticiones que se produzcan. El ejemplo
     mostrado arriba no incluye la direccion IP, de manera que Apache
     tiene que usar una resoluci&#243;n DNS para encontrar la
-    direcci&#243;n IP correspondiente a <code>www.abc.com</code>. Si
+    direcci&#243;n IP correspondiente a <code>www.abc.dom</code>. Si
     por alguna raz&#243;n la resoluci&#243;n DNS no est&#225;
     disponible en el momento en que su servidor est&#225; analizando
     sint&#225;nticamente su fichero de configuraci&#243;n, entonces
@@ -62,12 +62,12 @@
     hagan a ese host virtual (en las versiones de Apache anteriores a
     la 1.2 el servidor ni siquiera se iniciaba).</p>
 
-    <p>Suponga que <code>www.abc.com</code> tiene como direcci&#243;n
+    <p>Suponga que <code>www.abc.dom</code> tiene como direcci&#243;n
     IP la 10.0.0.1. Considere la siguiente configuraci&#243;n:</p>
 
     <example>
       &lt;VirtualHost 10.0.0.1&gt; <br />
-      ServerAdmin webgirl@abc.com <br />
+      ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
     </example>
@@ -88,8 +88,8 @@
 
     <example>
       &lt;VirtualHost 10.0.0.1&gt; <br />
-      ServerName www.abc.com <br />
-      ServerAdmin webgirl@abc.com <br />
+      ServerName www.abc.dom <br />
+      ServerAdmin webgirl@abc.dom <br />
       DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt;
     </example>
@@ -104,17 +104,17 @@
     de las dos b&#250;squedas de DNS mencionadas arriba falla para
     cualquiera de sus hosts virtuales. En algunos casos estas
     b&#250;squedas DNS puede que no est&#233;n bajo su control; por
-    ejemplo, si <code>abc.com</code> es uno de sus clientes y ellos
+    ejemplo, si <code>abc.dom</code> es uno de sus clientes y ellos
     controlan su propia DNS, pueden forzar a su servidor (pre-1.2) a
     fallar al iniciarse simplemente borrando el registro
-    <code>www.abc.com</code>.</p>
+    <code>www.abc.dom</code>.</p>
 
     <p>Otra formas pueden ser bastante m&#225;s complicadas. F&#237;jese
     en esta configuraci&#243;n:</p>
 
     <example>
-      &lt;VirtualHost www.abc.com&gt; <br />
-      &#xA0;&#xA0;ServerAdmin webgirl@abc.com <br />
+      &lt;VirtualHost www.abc.dom&gt; <br />
+      &#xA0;&#xA0;ServerAdmin webgirl@abc.dom <br />
       &#xA0;&#xA0;DocumentRoot /www/abc <br />
       &lt;/VirtualHost&gt; <br />
       <br />
@@ -125,19 +125,19 @@
     </example>
 
     <p>Suponga que ha asignado la direcci&#243;n 10.0.0.1 a
-    <code>www.abc.com</code> y 10.0.0.2 a
+    <code>www.abc.dom</code> y 10.0.0.2 a
     <code>www.def.com</code>. Todav&#237;a m&#225;s, suponga que
     <code>def.com</code> tiene el control de sus propias DNS. Con esta
     configuraci&#243;n ha puesto <code>def.com</code> en una
     posici&#243;n en la que puede robar todo el trafico destinado a
-    <code>abc.com</code>. Para conseguirlo, todo lo que tiene que
+    <code>abc.dom</code>. Para conseguirlo, todo lo que tiene que
     hacer es asignarle a <code>www.def.com</code> la direcci&#243;n
     10.0.0.1. Como ellos controlan sus propias DNS no puede evitar que
     apunten el registro <code>www.def.com</code> a donde quieran.</p>
 
     <p>Las peticiones dirigidas a la direcci&#243;n 10.0.0.1
     (inclu&#237;das aquellas en las los usuarios escriben URLs de tipo
-    <code>http://www.abc.com/whatever</code>) ser&#225;n todas
+    <code>http://www.abc.dom/whatever</code>) ser&#225;n todas
     servidas por el host virtual <code>def.com</code>. Comprender por
     qu&#233; ocurre esto requiere una discusi&#243;n m&#225;s profunda
     acerca de como Apache asigna las peticiones que recibe a los hosts

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html Wed Aug 24 04:51:40 2005
@@ -2,6 +2,10 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
+URI: auth.html.es
+Content-Language: es
+Content-type: text/html; charset=ISO-8859-1
+
 URI: auth.html.ja.euc-jp
 Content-Language: ja
 Content-type: text/html; charset=EUC-JP

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.en?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.en Wed Aug 24 04:51:40 2005
@@ -19,6 +19,7 @@
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs-project/">Documentation</a> &gt; <a href="../">Version 2.0</a> &gt; <a href="./">How-To / Tutorials</a></div><div id="page-content"><div id="preamble"><h1>Authentication, Authorization and Access Control</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/howto/auth.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
@@ -345,6 +346,7 @@
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/howto/auth.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.es
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ja.euc-jp
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ja.euc-jp?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ja.euc-jp [euc-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ja.euc-jp [euc-jp] Wed Aug 24 04:51:40 2005
@@ -19,6 +19,7 @@
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP サーバ</a> &gt; <a href="http://httpd.apache.org/docs-project/">ドキュメンテーション</a> &gt; <a href="../">バージョン 2.0</a> &gt; <a href="./">How-To / チュートリアル</a></div><div id="page-content"><div id="preamble"><h1>認証、承認、アクセス制御</h1>
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/howto/auth.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/howto/auth.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
@@ -378,6 +379,7 @@
 </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/howto/auth.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/howto/auth.html" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/auth.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ko.euc-kr
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ko.euc-kr?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.html.ko.euc-kr [euc-kr] Wed Aug 24 04:51:40 2005
@@ -21,6 +21,7 @@
 접근제어(Access Control)</h1>
 <div class="toplang">
 <p><span>가능한 언어: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/howto/auth.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/auth.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
@@ -315,6 +316,7 @@
 </div></div>
 <div class="bottomlang">
 <p><span>가능한 언어: </span><a href="../en/howto/auth.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/howto/auth.html" hreflang="es" rel="alternate" title="Espa&#241;ol">&nbsp;es&nbsp;</a> |
 <a href="../ja/howto/auth.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/howto/auth.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.xml.es
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.xml.meta?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.xml.meta (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/auth.xml.meta Wed Aug 24 04:51:40 2005
@@ -7,6 +7,7 @@
 
   <variants>
     <variant>en</variant>
+    <variant>es</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.de?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.de (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.de Wed Aug 24 04:51:40 2005
@@ -25,6 +25,9 @@
 <a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/install.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+            die neuesten Änderungen.</div>
 
     <p>Dieses Dokument umfaßt nur die Kompilierung und Installation des
     Apache auf Unix und Unix-ähnlichen Systemen. Für die

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.en?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.en Wed Aug 24 04:51:40 2005
@@ -155,14 +155,15 @@
       [OPTIONAL]</dt>
       <dd>For some of the support scripts like <code class="program"><a href="./programs/apxs.html">apxs</a></code> or <code class="program"><a href="./programs/dbmmanage.html">dbmmanage</a></code> (which are
       written in Perl) the Perl 5 interpreter is required (versions
-      5.003 or newer are sufficient). If no such interpreter is found by
-      the <code class="program"><a href="./programs/configure.html">configure</a></code> script there is no harm. Of course, you
-      still can build and install Apache 2.0. Only those support scripts
-      cannot be used. If you have multiple Perl interpreters
-      installed (perhaps a Perl 4 from the vendor and a Perl 5 from
-      your own), then it is recommended to use the <code>--with-perl</code>
-      option (see below) to make sure the correct one is selected
-      by <code class="program"><a href="./programs/configure.html">configure</a></code>.</dd>
+      5.003 or newer are sufficient). If you have multiple Perl 
+      interpreters (for example, a systemwide install of Perl 4, and 
+      your own install of Perl 5), you are advised to use the 
+      <code>--with-perl</code> option (see below) to make sure the 
+      correct one is used by <code class="program"><a href="./programs/configure.html">configure</a></code>.
+      If no Perl 5 interpreter is found by the 
+      <code class="program"><a href="./programs/configure.html">configure</a></code> script, you will not be able to use 
+      the affected support scripts. Of course, you will still be able to 
+      build and use Apache 2.0.</dd>
     </dl>
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.es?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.html.es Wed Aug 24 04:51:40 2005
@@ -25,6 +25,10 @@
 <a href="./ko/install.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/install.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div>
+<div class="outofdate">Esta traducción podría estar
+            obsoleta. Consulte la versión en inglés de la
+            documentación para comprobar si se han producido cambios
+            recientemente.</div>
 
 
     <p>Este documento explica cómo compilar e instalar Apache en

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml Wed Aug 24 04:51:40 2005
@@ -152,14 +152,15 @@
       <dd>For some of the support scripts like <program>
       apxs</program> or <program>dbmmanage</program> (which are
       written in Perl) the Perl 5 interpreter is required (versions
-      5.003 or newer are sufficient). If no such interpreter is found by
-      the <program>configure</program> script there is no harm. Of course, you
-      still can build and install Apache 2.0. Only those support scripts
-      cannot be used. If you have multiple Perl interpreters
-      installed (perhaps a Perl 4 from the vendor and a Perl 5 from
-      your own), then it is recommended to use the <code>--with-perl</code>
-      option (see below) to make sure the correct one is selected
-      by <program>configure</program>.</dd>
+      5.003 or newer are sufficient). If you have multiple Perl 
+      interpreters (for example, a systemwide install of Perl 4, and 
+      your own install of Perl 5), you are advised to use the 
+      <code>--with-perl</code> option (see below) to make sure the 
+      correct one is used by <program>configure</program>.
+      If no Perl 5 interpreter is found by the 
+      <program>configure</program> script, you will not be able to use 
+      the affected support scripts. Of course, you will still be able to 
+      build and use Apache 2.0.</dd>
     </dl>
 </section>
 

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.de?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.de (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.de Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 178522 -->
+<!-- English Revision: 178522:239259 (outdated) -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.es?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.es Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 178522 -->
+<!-- English Revision: 178522:239259 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ja?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ja [iso-2022-jp] Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 106090:178522 (outdated) -->
+<!-- English Revision: 106090:239259 (outdated) -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ko?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ko [euc-kr] Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 106090:178522 (outdated) -->
+<!-- English Revision: 106090:239259 (outdated) -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.meta?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.meta (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.meta Wed Aug 24 04:51:40 2005
@@ -6,9 +6,9 @@
   <relpath>.</relpath>
 
   <variants>
-    <variant>de</variant>
+    <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>es</variant>
+    <variant outdated="yes">es</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">ru</variant>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ru
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ru?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ru [koi8-r] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/install.xml.ru [koi8-r] Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='KOI8-R' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ru.xsl"?>
-<!-- English Revision: 97974:178522 (outdated) -->
+<!-- English Revision: 97974:239259 (outdated) -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.de?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.de (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.de Wed Aug 24 04:51:40 2005
@@ -25,6 +25,9 @@
 <a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/stopping.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+            die neuesten Änderungen.</div>
 
     <p>Dieses Dokument umfasst das Beenden und Neustarten des
     Apache auf Unix-ähnlichen Systemen. Anwender von Windows NT, 2000

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.en?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.en Wed Aug 24 04:51:40 2005
@@ -118,9 +118,10 @@
     been created, then create enough to pick up the slack. Hence the
     code tries to maintain both the number of children appropriate for
     the current load on the server, and respect your wishes with the
-    <code class="directive">StartServers</code> parameter.</p>
+    <code class="directive"><a href="./mod/mpm_common.html#startservers">StartServers</a></code> 
+    parameter.</p>
 
-    <p>Users of the <code class="module"><a href="./mod/mod_status.html">mod_status</a></code>
+    <p>Users of <code class="module"><a href="./mod/mod_status.html">mod_status</a></code>
     will notice that the server statistics are <strong>not</strong>
     set to zero when a <code>USR1</code> is sent. The code was
     written to both minimize the time in which the server is unable
@@ -187,24 +188,25 @@
 <h2><a name="race" id="race">Appendix: signals and race conditions</a></h2>
 
     <p>Prior to Apache 1.2b9 there were several <em>race
-    conditions</em> involving the restart and die signals (a simple
-    description of race condition is: a time-sensitive problem, as
-    in if something happens at just the wrong time it won't behave
-    as expected). For those architectures that have the "right"
+    conditions</em> involving the restart and die signals (a simply put, 
+    a race condition is a time-sensitive problem - if something happens 
+    at just the wrong time or things happen in the wrong order, 
+    undesired behaviour will result. If the same thing happens at the right 
+    time, all will be well). For those architectures that have the "right"
     feature set we have eliminated as many as we can. But it should
-    be noted that there still do exist race conditions on certain
+    be noted that race conditions do still exist on certain
     architectures.</p>
 
-    <p>Architectures that use an on disk <code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code> have the potential
-    to corrupt their scoreboards. This can result in the "bind:
+    <p>Architectures that use an on-disk <code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code> can potentially have 
+    their scoreboards corrupted. This can result in the "bind:
     Address already in use" (after <code>HUP</code>) or "long lost
     child came home!" (after <code>USR1</code>). The former is a fatal
     error, while the latter just causes the server to lose a
-    scoreboard slot. So it might be advisable to use graceful
+    scoreboard slot. So it may be advisable to use graceful
     restarts, with an occasional hard restart. These problems are very
     difficult to work around, but fortunately most architectures do
-    not require a scoreboard file. See the <code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code> documentation for a
-    architecture uses it.</p>
+    not require a scoreboard file. See the <code class="directive"><a href="./mod/mpm_common.html#scoreboardfile">ScoreBoardFile</a></code> documentation for
+    architecture which uses it.</p>
 
     <p>All architectures have a small race condition in each child
     involving the second and subsequent requests on a persistent

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.es?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.html.es Wed Aug 24 04:51:40 2005
@@ -25,6 +25,10 @@
 <a href="./ko/stopping.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./ru/stopping.html" hreflang="ru" rel="alternate" title="Russian">&nbsp;ru&nbsp;</a></p>
 </div>
+<div class="outofdate">Esta traducción podría estar
+            obsoleta. Consulte la versión en inglés de la
+            documentación para comprobar si se han producido cambios
+            recientemente.</div>
 
     <p>Este documento explica como iniciar y parar el servidor Apache
      en sistemas tipo Unix. Los usuarios de Windows NT, 2000 y XP

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml Wed Aug 24 04:51:40 2005
@@ -119,9 +119,10 @@
     been created, then create enough to pick up the slack. Hence the
     code tries to maintain both the number of children appropriate for
     the current load on the server, and respect your wishes with the
-    <directive>StartServers</directive> parameter.</p>
+    <directive module="mpm_common">StartServers</directive> 
+    parameter.</p>
 
-    <p>Users of the <module>mod_status</module>
+    <p>Users of <module>mod_status</module>
     will notice that the server statistics are <strong>not</strong>
     set to zero when a <code>USR1</code> is sent. The code was
     written to both minimize the time in which the server is unable
@@ -188,26 +189,27 @@
 <section id="race"><title>Appendix: signals and race conditions</title>
 
     <p>Prior to Apache 1.2b9 there were several <em>race
-    conditions</em> involving the restart and die signals (a simple
-    description of race condition is: a time-sensitive problem, as
-    in if something happens at just the wrong time it won't behave
-    as expected). For those architectures that have the "right"
+    conditions</em> involving the restart and die signals (a simply put, 
+    a race condition is a time-sensitive problem - if something happens 
+    at just the wrong time or things happen in the wrong order, 
+    undesired behaviour will result. If the same thing happens at the right 
+    time, all will be well). For those architectures that have the "right"
     feature set we have eliminated as many as we can. But it should
-    be noted that there still do exist race conditions on certain
+    be noted that race conditions do still exist on certain
     architectures.</p>
 
-    <p>Architectures that use an on disk <directive
-    module="mpm_common">ScoreBoardFile</directive> have the potential
-    to corrupt their scoreboards. This can result in the "bind:
+    <p>Architectures that use an on-disk <directive
+    module="mpm_common">ScoreBoardFile</directive> can potentially have 
+    their scoreboards corrupted. This can result in the "bind:
     Address already in use" (after <code>HUP</code>) or "long lost
     child came home!" (after <code>USR1</code>). The former is a fatal
     error, while the latter just causes the server to lose a
-    scoreboard slot. So it might be advisable to use graceful
+    scoreboard slot. So it may be advisable to use graceful
     restarts, with an occasional hard restart. These problems are very
     difficult to work around, but fortunately most architectures do
     not require a scoreboard file. See the <directive
-    module="mpm_common">ScoreBoardFile</directive> documentation for a
-    architecture uses it.</p>
+    module="mpm_common">ScoreBoardFile</directive> documentation for
+    architecture which uses it.</p>
 
     <p>All architectures have a small race condition in each child
     involving the second and subsequent requests on a persistent

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.de?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.de (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.de Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 151405 -->
+<!-- English Revision: 151405:239259 (outdated) -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.es?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.es Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 151405 -->
+<!-- English Revision: 151405:239259 (outdated) -->
 
 <!--
  Copyright 2004-2005 The Apache Software Foundation or it licensors,

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ja?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ja [iso-2022-jp] Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 106090:151405 (outdated) -->
+<!-- English Revision: 106090:239259 (outdated) -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ko?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ko [euc-kr] Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 106090:151405 (outdated) -->
+<!-- English Revision: 106090:239259 (outdated) -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.meta?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.meta (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.meta Wed Aug 24 04:51:40 2005
@@ -6,9 +6,9 @@
   <relpath>.</relpath>
 
   <variants>
-    <variant>de</variant>
+    <variant outdated="yes">de</variant>
     <variant>en</variant>
-    <variant>es</variant>
+    <variant outdated="yes">es</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">ru</variant>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ru
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ru?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ru [koi8-r] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/stopping.xml.ru [koi8-r] Wed Aug 24 04:51:40 2005
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='KOI8-R' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ru.xsl"?>
-<!-- English Revision: 98017:151405 (outdated) -->
+<!-- English Revision: 98017:239259 (outdated) -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap.c?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap.c Wed Aug 24 04:51:40 2005
@@ -43,6 +43,11 @@
 #error mod_ldap requires APR-util to have LDAP support built in
 #endif
 
+#if !defined(OS2) && !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
+#include "unixd.h"
+#define UTIL_LDAP_SET_MUTEX_PERMS
+#endif
+
     /* defines for certificate file types
     */
 #define LDAP_CA_TYPE_UNKNOWN            0
@@ -325,7 +330,7 @@
         }
 
         if (st->connectionTimeout >= 0) {
-            rc = ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, (void *)&timeOut);
+            rc = ldap_set_option(ldc->ldap, LDAP_OPT_NETWORK_TIMEOUT, (void *)&timeOut);
             if (APR_SUCCESS != rc) {
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                                  "LDAP: Could not set the connection timeout" );
@@ -1466,6 +1471,15 @@
             return result;
         }
 
+#ifdef UTIL_LDAP_SET_MUTEX_PERMS
+        result = unixd_set_global_mutex_perms(st->util_ldap_cache_lock);
+        if (result != APR_SUCCESS) {
+            ap_log_error(APLOG_MARK, APLOG_CRIT, result, s, 
+                         "LDAP cache: failed to set mutex permissions");
+            return result;
+        }
+#endif
+
         /* merge config in all vhost */
         s_vhost = s->next;
         while (s_vhost) {
@@ -1650,8 +1664,9 @@
 static void util_ldap_child_init(apr_pool_t *p, server_rec *s)
 {
     apr_status_t sts;
-    util_ldap_state_t *st =
-        (util_ldap_state_t *)ap_get_module_config(s->module_config, &ldap_module);
+    util_ldap_state_t *st = ap_get_module_config(s->module_config, &ldap_module);
+
+    if (!st->util_ldap_cache_lock) return;
 
     sts = apr_global_mutex_child_init(&st->util_ldap_cache_lock, st->lock_file, p);
     if (sts != APR_SUCCESS) {

Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache.c?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache.c Wed Aug 24 04:51:40 2005
@@ -397,8 +397,11 @@
 {
 #if APR_HAS_SHARED_MEMORY
     apr_status_t result;
+    apr_size_t size;
 
-    result = apr_shm_create(&st->cache_shm, st->cache_bytes, st->cache_file, st->pool);
+    size = APR_ALIGN_DEFAULT(st->cache_bytes);
+
+    result = apr_shm_create(&st->cache_shm, size, st->cache_file, st->pool);
     if (result == APR_EEXIST) {
         /*
          * The cache could have already been created (i.e. we may be a child process).  See
@@ -410,8 +413,17 @@
         return result;
     }
 
+    /* Determine the usable size of the shm segment. */
+    size = apr_shm_size_get(st->cache_shm);
+
     /* This will create a rmm "handler" to get into the shared memory area */
-    apr_rmm_init(&st->cache_rmm, NULL, (void *)apr_shm_baseaddr_get(st->cache_shm), st->cache_bytes, st->pool);
+    result = apr_rmm_init(&st->cache_rmm, NULL, 
+                          apr_shm_baseaddr_get(st->cache_shm), size, 
+                          st->pool);
+    if (result != APR_SUCCESS) {
+        return result;
+    }
+
 #endif
 
     apr_pool_cleanup_register(st->pool, st , util_ldap_cache_module_kill, apr_pool_cleanup_null);

Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache_mgr.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache_mgr.c?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache_mgr.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap_cache_mgr.c Wed Aug 24 04:51:40 2005
@@ -402,11 +402,18 @@
         return NULL;
     }
 
+    /* Take a copy of the payload before proceeeding. */
+    payload = (*cache->copy)(cache, payload);
+    if (!payload) {
+        util_ald_free(cache, node);
+        return NULL;
+    }
+
     /* populate the entry */
     cache->inserts++;
     hashval = (*cache->hash)(payload) % cache->size;
     node->add_time = apr_time_now();
-    node->payload = (*cache->copy)(cache, payload);
+    node->payload = payload;
     node->next = cache->nodes[hashval];
     cache->nodes[hashval] = node;
 

Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/http/http_protocol.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/http/http_protocol.c?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/http/http_protocol.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/http/http_protocol.c Wed Aug 24 04:51:40 2005
@@ -2856,18 +2856,35 @@
 #define MIN_LENGTH(len1, len2) ((len1 > len2) ? len2 : len1)
     request_rec *r = f->r;
     conn_rec *c = r->connection;
-    byterange_ctx *ctx = f->ctx;
+    byterange_ctx *ctx;
     apr_bucket *e;
     apr_bucket_brigade *bsend;
     apr_off_t range_start;
     apr_off_t range_end;
     char *current;
-    apr_off_t bb_length;
     apr_off_t clength = 0;
     apr_status_t rv;
     int found = 0;
 
-    if (!ctx) {
+    /* Iterate through the brigade until reaching EOS or a bucket with
+     * unknown length. */
+    for (e = APR_BRIGADE_FIRST(bb);
+         (e != APR_BRIGADE_SENTINEL(bb) && !APR_BUCKET_IS_EOS(e)
+          && e->length != (apr_size_t)-1);
+         e = APR_BUCKET_NEXT(e)) {
+        clength += e->length;
+    }
+
+    /* Don't attempt to do byte range work if this brigade doesn't
+     * contain an EOS, or if any of the buckets has an unknown length;
+     * this avoids the cases where it is expensive to perform
+     * byteranging (i.e. may require arbitrary amounts of memory). */
+    if (!APR_BUCKET_IS_EOS(e) || clength <= 0) {
+        ap_remove_output_filter(f);
+        return ap_pass_brigade(f->next, bb);
+    }
+
+    {
         int num_ranges = ap_set_byterange(r);
 
         /* We have nothing to do, get out of the way. */
@@ -2876,7 +2893,7 @@
             return ap_pass_brigade(f->next, bb);
         }
 
-        ctx = f->ctx = apr_pcalloc(r->pool, sizeof(*ctx));
+        ctx = apr_pcalloc(r->pool, sizeof(*ctx));
         ctx->num_ranges = num_ranges;
         /* create a brigade in case we never call ap_save_brigade() */
         ctx->bb = apr_brigade_create(r->pool, c->bucket_alloc);
@@ -2902,29 +2919,6 @@
             ap_xlate_proto_to_ascii(ctx->bound_head, strlen(ctx->bound_head));
         }
     }
-
-    /* We can't actually deal with byte-ranges until we have the whole brigade
-     * because the byte-ranges can be in any order, and according to the RFC,
-     * we SHOULD return the data in the same order it was requested.
-     *
-     * XXX: We really need to dump all bytes prior to the start of the earliest
-     * range, and only slurp up to the end of the latest range.  By this we
-     * mean that we should peek-ahead at the lowest first byte of any range,
-     * and the highest last byte of any range.
-     */
-    if (!APR_BUCKET_IS_EOS(APR_BRIGADE_LAST(bb))) {
-        ap_save_brigade(f, &ctx->bb, &bb, r->pool);
-        return APR_SUCCESS;
-    }
-
-    /* Prepend any earlier saved brigades. */
-    APR_BRIGADE_PREPEND(bb, ctx->bb);
-
-    /* It is possible that we won't have a content length yet, so we have to
-     * compute the length before we can actually do the byterange work.
-     */
-    apr_brigade_length(bb, 1, &bb_length);
-    clength = (apr_off_t)bb_length;
 
     /* this brigade holds what we will be sending */
     bsend = apr_brigade_create(r->pool, c->bucket_alloc);

Modified: httpd/httpd/branches/mod_version_for_2.0.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/modules/proxy/proxy_util.c?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/modules/proxy/proxy_util.c Wed Aug 24 04:51:40 2005
@@ -161,7 +161,7 @@
 	    continue;
 	}
 /* decode it if not already done */
-	if (isenc && ch == '%') {
+	if (isenc && (isenc != PROXYREQ_REVERSE) && (ch == '%')) {
 	    if (!apr_isxdigit(x[i + 1]) || !apr_isxdigit(x[i + 2]))
 		return NULL;
 	    ch = ap_proxy_hex2c(&x[i + 1]);

Modified: httpd/httpd/branches/mod_version_for_2.0.x/server/log.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/server/log.c?rev=239612&r1=239611&r2=239612&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/server/log.c (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/server/log.c Wed Aug 24 04:51:40 2005
@@ -763,9 +763,9 @@
 /* forward declaration */
 static void piped_log_maintenance(int reason, void *data, apr_wait_t status);
 
-static int piped_log_spawn(piped_log *pl)
+/* Spawn the piped logger process pl->program. */
+static apr_status_t piped_log_spawn(piped_log *pl)
 {
-    int rc = 0;
     apr_procattr_t *procattr;
     apr_proc_t *procnew = NULL;
     apr_status_t status;
@@ -783,7 +783,6 @@
         ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                      "piped_log_spawn: unable to setup child process '%s': %s",
                      pl->program, apr_strerror(status, buf, sizeof(buf)));
-        rc = -1;
     }
     else {
         char **args;
@@ -797,7 +796,11 @@
 
         if (status == APR_SUCCESS) {
             pl->pid = procnew;
-            ap_piped_log_write_fd(pl) = procnew->in;
+            /* procnew->in was dup2'd from ap_piped_log_write_fd(pl);
+             * since the original fd is still valid, close the copy to
+             * avoid a leak. */
+            apr_file_close(procnew->in);
+            procnew->in = NULL;
             apr_proc_other_child_register(procnew, piped_log_maintenance, pl,
                                           ap_piped_log_write_fd(pl), pl->p);
             close_handle_in_child(pl->p, ap_piped_log_read_fd(pl));
@@ -808,11 +811,10 @@
             ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
                          "unable to start piped log program '%s': %s",
                          pl->program, apr_strerror(status, buf, sizeof(buf)));
-            rc = -1;
         }
     }
 
-    return rc;
+    return status;
 }
 
 
@@ -904,12 +906,10 @@
     }
     apr_pool_cleanup_register(p, pl, piped_log_cleanup,
                               piped_log_cleanup_for_exec);
-    if (piped_log_spawn(pl) == -1) {
-        int save_errno = errno;
+    if (piped_log_spawn(pl) != APR_SUCCESS) {
         apr_pool_cleanup_kill(p, pl, piped_log_cleanup);
         apr_file_close(ap_piped_log_read_fd(pl));
         apr_file_close(ap_piped_log_write_fd(pl));
-        errno = save_errno;
         return NULL;
     }
     return pl;

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/srclib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 24 04:51:40 2005
@@ -1,3 +1,8 @@
 Makefile
 pth
 .deps
+apr
+apr-util
+apr-iconv
+openssl
+zlib



Mime
View raw message