httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject svn commit: r170803 [1/7] - in /httpd/httpd/branches/mod_version_for_2.0.x: ./ build/ docs/conf/ docs/man/ docs/manual/ docs/manual/howto/ docs/manual/mod/ docs/manual/programs/ docs/manual/style/ docs/manual/vhosts/ include/ modules/dav/main/ modules/experimental/ modules/metadata/
Date Wed, 18 May 2005 19:53:37 GMT
Author: nd
Date: Wed May 18 12:53:33 2005
New Revision: 170803

URL: http://svn.apache.org/viewcvs?rev=170803&view=rev
Log:
mod_version_for_2.0.x branch:
* Merge r160788 to r170801 from branches/2.0.x. Docs conflicts revolved
  manually -- never build docs in a branch that's going to be merged back...
* mv 2.0.54 references to 2.0.55
* adjust mod_version copyright notice

Added:
    httpd/httpd/branches/mod_version_for_2.0.x/docs/man/htdbm.1   (props changed)
      - copied unchanged from r170785, httpd/httpd/branches/2.0.x/docs/man/htdbm.1
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.es   (props changed)
      - copied unchanged from r170785, httpd/httpd/branches/2.0.x/docs/manual/mod/core.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.es   (props changed)
      - copied unchanged from r170785, httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/htdbm.html   (props changed)
      - copied unchanged from r170785, httpd/httpd/branches/2.0.x/docs/manual/programs/htdbm.html
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/htdbm.html.en   (props changed)
      - copied unchanged from r170785, httpd/httpd/branches/2.0.x/docs/manual/programs/htdbm.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/htdbm.xml   (props changed)
      - copied unchanged from r170785, httpd/httpd/branches/2.0.x/docs/manual/programs/htdbm.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/htdbm.xml.meta   (props changed)
      - copied unchanged from r170785, httpd/httpd/branches/2.0.x/docs/manual/programs/htdbm.xml.meta
Modified:
    httpd/httpd/branches/mod_version_for_2.0.x/CHANGES
    httpd/httpd/branches/mod_version_for_2.0.x/STATUS
    httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUenvironment.inc
    httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUtail.inc
    httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-std.conf.in
    httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-win.conf
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ja
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ja
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.meta
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/allmodules.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.ja.euc-jp
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.ja
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.meta
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ja.euc-jp
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ko.euc-kr
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ru.koi8-r
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/index.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ja
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/quickreference.html.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/quickreference.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/quickreference.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/quickreference.html.ja.euc-jp
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/quickreference.html.ko.euc-kr
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/quickreference.html.ru.koi8-r
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mpm.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mpm.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mpm.xml.meta
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/configure.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/configure.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/configure.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/index.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/index.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/index.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/index.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/index.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/index.xml.meta
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/programs/index.xml.ru
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.html.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.html.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.html.ja.euc-jp
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.html.ko.euc-kr
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.xml.de
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.xml.es
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.xml.ja
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/sitemap.xml.meta
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/style/build.properties
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/vhosts/ip-based.html.en
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/vhosts/ip-based.xml
    httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/vhosts/ip-based.xml.ko
    httpd/httpd/branches/mod_version_for_2.0.x/include/ap_mmn.h
    httpd/httpd/branches/mod_version_for_2.0.x/include/ap_release.h
    httpd/httpd/branches/mod_version_for_2.0.x/modules/dav/main/dav.imp
    httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/mod_cache.c
    httpd/httpd/branches/mod_version_for_2.0.x/modules/experimental/util_ldap.c
    httpd/httpd/branches/mod_version_for_2.0.x/modules/metadata/mod_version.c

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=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/CHANGES (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/CHANGES Wed May 18 12:53:33 2005
@@ -1,4 +1,4 @@
-Changes with Apache 2.0.54
+Changes with Apache 2.0.55
 
   *) Added new module mod_version, which provides version dependent
      configuration containers.  [André Malo]
@@ -6,6 +6,8 @@
   *) Add core version query function (ap_get_server_revision) and
      accompanying ap_version_t structure (minor MMN bump).
      [André Malo]
+
+Changes with Apache 2.0.54
 
   *) mod_cache: Add CacheIgnoreHeaders directive.  PR 30399.
      [Rüiger Plü <r.pluem t-online.de>]

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=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/STATUS (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/STATUS Wed May 18 12:53:33 2005
@@ -6,7 +6,8 @@
 
 Release history:
 
-    2.0.54  : in development
+    2.0.55  : in development
+    2.0.54  : released April 17, 2005 as GA.
     2.0.53  : released February 7, 2005 as GA.
     2.0.52  : released September 28, 2004 as GA.
     2.0.51  : released September 15, 2004 as GA.
@@ -94,6 +95,31 @@
     identify exactly what the proposed changes are! ]
   [ 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
+
+    *) Prevent hang writing to piped logger at graceful restart time.
+       PR: 26467
+         http://svn.apache.org/viewcvs?rev=170281&view=rev
+       +1: trawick, jorton
+       -0: pquerna: This adds a new public function.  It should be either a 
+           minor MMN bump, or be put under CORE_PRIVATE.
+
+    *) 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
+       [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
@@ -131,6 +157,10 @@
          do we have to wait for later APR 0.x release before putting
          calls to apr_procattr_addrspace_set() into httpd-2.0.x, or
          do we go ahead and introduce the prerequisite?
+       clar replies: I am ready to commit the apr 0.9.x patch, but then will need 
+         the changes in the httpd-2.0.x to be done in order for NetWare to work
+         as expected when calling apr_proc_create. Should I do both, APR and Http,
+         at the same time?
 
     *) mod_actions: Regression from 1.3: the file referred to must exist.
        Solve this by introducing the "virtual" modifier to the Action
@@ -176,6 +206,7 @@
       jerenkrantz says: r126224 fixes brokenness with r125495 on Solaris.
       +1: thommay, jerenkrantz, trawick
       trawick: "which" isn't portable; I've suggested a work-around on dev@
+        (not standing in way of backport)
       jorton said: NetBSD's which isn't sufficient either.
       jerenkrantz: Since it's not in the critical path (and depends on
                    mod_log_forensic), I think it's still worth it to backport
@@ -187,25 +218,11 @@
       http://svn.apache.org/viewcvs?view=rev&rev=154319
       +1: stoddard, striker, wrowe (as corrected in subsequent patches)
 
-    * don't propagate input headers describing a body to a GET subrequest
-      with no body
-      http://svn.apache.org/viewcvs?view=rev&rev=158798
-      http://svn.apache.org/viewcvs?view=rev&rev=159410
-      http://svn.apache.org/viewcvs?view=rev&rev=160573
-      +1: gregames
-      -1: jerenkrantz (read_length isn't a sufficient check to see if a body
-                       is present in the request; presence of T-E and C-L in
-                       the headers is the correct flag.)
-      +/-0: wrowe (this has a negative impact on modules who wish to 'inspect'
-            the headers, e.g. an xml transformation affected by the query
-            string or request POST args.  The right solution is adopt apreq,
-            providing an API for filters to participate in POST bodies.)
-      gregames: done in rev 160573
-
-    * mod_version: New Module, Backport from trunk.
-      http://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/metadata/mod_version.c
-      (Also need to backport docs, and build system stuff.)
-      +1: pquerna, jerenkrantz, wrowe (trivial, would even be cool in 1.3)
+    * mod_version: New Module, Backport from trunk. Requires Minor MMN Bump.
+      http://svn.apache.org/repos/asf/httpd/httpd/branches/mod_version_for_2.0.x
+      +1: pquerna 
+      Votes from before the integration branch:
+          +1: jerenkrantz, wrowe (trivial, would even be cool in 1.3)
 
     *) Provide TLS/SSL upgrade functionality in mod_ssl allowing an unsecure
        connection to be upgraded to a secure connection upon request by the
@@ -225,6 +242,34 @@
        -0: pquerna (2.2)
        -0: jorton (msgid <20040305083540.GA24529@redhat.com>)
 
+     *) mod_ssl: Fix issues picking up ssl-unclean-shutdown setting
+        for e.g. a reverse proxy config, breaking interop with MSIE
+        in some cases.
+        http://svn.apache.org/viewcvs?view=rev&rev=161958
+        rediffed for 2.0.x as:
+        http://issues.apache.org/bugzilla/attachment.cgi?id=14804
+        PR: 34452
+        +1: jorton
+
+     *) mod_userdir: fix to palloc(sizeof struct) not palloc(sizeof pointer)
+        http://svn.apache.org/viewcvs?rev=165151&view=rev
+        PR: 34588
+        +1: jorton, trawick (isn't it worth a CHANGES entry for a storage
+            corruption fix?)
+	    
+     *) mod_ldap: Change the LDAP connection timeout to per-connection rather
+        than global. Fixes PR: 34618
+	http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=164919&r1=164918&r2=164919&view=diff
+	or 2.0 view patch
+	http://issues.apache.org/bugzilla/attachment.cgi?id=14873
+	+1: bnicholes, minfrin, pquerna
+	
+     *) Have configure refuse to build with doomed combinations of
+        internal/external APR/APR-util.
+          http://svn.apache.org/viewcvs?rev=170029&view=rev
+        +1: jorton, nd, trawick, pquerna
+
+
 PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:
 
     *) Remove LDAP toolkit specific code from util_ldap and mod_auth_ldap.
@@ -350,9 +395,31 @@
     * ThreadStackSize for Win32 and threaded MPMs
       trawick will eventually put together a patch for httpd 2.0.next
       +1 concept: trawick, nd, stoddard, wrowe
-
+      
+    * don't propagate input headers describing a body to a GET subrequest
+      with no body
+      http://svn.apache.org/viewcvs?view=rev&rev=158798
+      http://svn.apache.org/viewcvs?view=rev&rev=159410
+      http://svn.apache.org/viewcvs?view=rev&rev=160573
+      +1: gregames
+      -1: jerenkrantz (read_length isn't a sufficient check to see if a body
+                       is present in the request; presence of T-E and C-L in
+                       the headers is the correct flag.)
+          gregames: done in rev 160573
+      ±0: wrowe (this has a negative impact on modules who wish to 'inspect'
+            the headers, e.g. an xml transformation affected by the query
+            string or request POST args.  The right solution is adopt apreq,
+            providing an API for filters to participate in POST bodies.)
+          gregames: this does not affect POSTs.  the affected function helps
+            create a GET subrequest with no body and is unprepared to deal with
+            subrequest bodies.  any modules or applications wishing to
+            inspect headers will in fact work better because the headers will
+            reflect reality.
 
 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/build/NWGNUenvironment.inc
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUenvironment.inc?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUenvironment.inc (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUenvironment.inc Wed May 18 12:53:33 2005
@@ -127,6 +127,9 @@
 endif
 
 DEFINES		= -DNETWARE
+ifndef DEBUG
+DEFINES += -DNDEBUG
+endif
 
 #
 # MetroWerks static Libraries

Modified: httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUtail.inc
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUtail.inc?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUtail.inc (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/build/NWGNUtail.inc Wed May 18 12:53:33 2005
@@ -25,7 +25,7 @@
 endif
 
 ifndef NLM_COPYRIGHT
-NLM_COPYRIGHT = Copyright (c) 2000-2004 The Apache Software Foundation. All rights reserved.
+NLM_COPYRIGHT = Copyright (c) 2000-2005 The Apache Software Foundation. All rights reserved.
 endif
 
 #

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-std.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-std.conf.in?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-std.conf.in (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-std.conf.in Wed May 18 12:53:33 2005
@@ -930,6 +930,7 @@
 #    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
 #    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
 #    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
+#    ErrorDocument 406 /error/HTTP_NOT_ACCEPTABLE.html.var
 #    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
 #    ErrorDocument 410 /error/HTTP_GONE.html.var
 #    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
@@ -963,7 +964,7 @@
 #
 BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
 BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
 BrowserMatch "^gnome-vfs" redirect-carefully
 
 #

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-win.conf
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-win.conf?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-win.conf (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/conf/httpd-win.conf Wed May 18 12:53:33 2005
@@ -882,7 +882,7 @@
 #
 BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
 BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[012]" redirect-carefully
+BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
 BrowserMatch "^gnome-vfs" redirect-carefully
 
 #

Copied: httpd/httpd/branches/mod_version_for_2.0.x/docs/man/htdbm.1 (from r170785, httpd/httpd/branches/2.0.x/docs/man/htdbm.1)
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/man/htdbm.1?p2=httpd/httpd/branches/mod_version_for_2.0.x/docs/man/htdbm.1&p1=httpd/httpd/branches/2.0.x/docs/man/htdbm.1&r1=170785&r2=170803&rev=170803&view=diff
==============================================================================
    (empty)

Propchange: httpd/httpd/branches/mod_version_for_2.0.x/docs/man/htdbm.1
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.html.en?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.html.en Wed May 18 12:53:33 2005
@@ -238,6 +238,34 @@
     permitted, as only <code>Options Includes</code> is in effect, which
     completely overrides any earlier setting that may have been in
     place.</p>
+
+    <h3><a name="merge" id="merge">Merging of .htaccess with the main
+    configuration files</a></h3>
+
+    <p>As discussed in the documentation on <a href="../sections.html">Configuration Sections</a>,
+    <code>.htaccess</code> files can override the <code class="directive"><a href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections for
+    the corresponding directory, but will be overriden by other types
+    of configuration sections from the main configuration files.  This
+    fact can be used to enforce certain configurations, even in the
+    presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code> setting.  For example, to
+    prevent script execution while allowing anything else to be set in
+    <code>.htaccess</code> you can use:</p>
+
+    <div class="example"><p><code>
+&lt;Directory /&gt;<br />
+<span class="indent">
+Allowoverride All<br />
+</span>
+&lt;/Directory&gt;<br />
+<br />
+&lt;Location /&gt;<br />
+<span class="indent">
+Options +IncludesNoExec -ExecCGI<br />
+</span>
+&lt;/Location&gt;
+    </code></p></div>
+
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="auth" id="auth">Authentication example</a></h2>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml Wed May 18 12:53:33 2005
@@ -264,6 +264,37 @@
     permitted, as only <code>Options Includes</code> is in effect, which
     completely overrides any earlier setting that may have been in
     place.</p>
+
+    <section id="merge"><title>Merging of .htaccess with the main
+    configuration files</title>
+
+    <p>As discussed in the documentation on <a
+    href="../sections.html">Configuration Sections</a>,
+    <code>.htaccess</code> files can override the <directive
+    type="section" module="core">Directory</directive> sections for
+    the corresponding directory, but will be overriden by other types
+    of configuration sections from the main configuration files.  This
+    fact can be used to enforce certain configurations, even in the
+    presence of a liberal <directive
+    module="core">AllowOverride</directive> setting.  For example, to
+    prevent script execution while allowing anything else to be set in
+    <code>.htaccess</code> you can use:</p>
+
+    <example>
+&lt;Directory /&gt;<br />
+<indent>
+Allowoverride All<br />
+</indent>
+&lt;/Directory&gt;<br />
+<br />
+&lt;Location /&gt;<br />
+<indent>
+Options +IncludesNoExec -ExecCGI<br />
+</indent>
+&lt;/Location&gt;
+    </example>
+</section>
+
 </section>
 
 <section id="auth"><title>Authentication example</title>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ja?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ja [iso-2022-jp] Wed May 18 12:53:33 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:167971 (outdated) -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ko?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/howto/htaccess.xml.ko [euc-kr] Wed May 18 12:53:33 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:167971 (outdated) -->
 
 <!--
  Copyright 2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.en?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.en Wed May 18 12:53:33 2005
@@ -247,7 +247,7 @@
         (<code>%t</code>)</dt>
 
         <dd>
-          The time that the server finished processing the request.
+          The time that the request was received.
           The format is: 
 
           <p class="indent">

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.es?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.html.es Wed May 18 12:53:33 2005
@@ -23,6 +23,10 @@
 <a href="./ja/logs.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="./ko/logs.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&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>Para administrar de manera efectiva un servidor web, es
     necesario tener registros de la actividad y el rendimiento del

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml Wed May 18 12:53:33 2005
@@ -261,7 +261,7 @@
         (<code>%t</code>)</dt>
 
         <dd>
-          The time that the server finished processing the request.
+          The time that the request was received.
           The format is: 
 
           <p class="indent">

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.es?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.es Wed May 18 12:53:33 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:165672 (outdated) -->
 
 <!--
  Copyright 2005 The Apache Software Foundation or it licensors,

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ja?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ja [iso-2022-jp] Wed May 18 12:53:33 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:165672 (outdated) -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ko?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.ko [euc-kr] Wed May 18 12:53:33 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:165672 (outdated) -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.meta?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.meta (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/logs.xml.meta Wed May 18 12:53:33 2005
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>es</variant>
+    <variant outdated="yes">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/mod/allmodules.xml.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/allmodules.xml.es?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/allmodules.xml.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/allmodules.xml.es Wed May 18 12:53:33 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <modulefilelist>
-  <modulefile>core.xml</modulefile>
+  <modulefile>core.xml.es</modulefile>
   <modulefile>mod_access.xml</modulefile>
   <modulefile>mod_actions.xml</modulefile>
   <modulefile>mod_alias.xml</modulefile>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html Wed May 18 12:53:33 2005
@@ -6,6 +6,10 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
+URI: core.html.es
+Content-Language: es
+Content-type: text/html; charset=ISO-8859-1
+
 URI: core.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/mod/core.html.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.de?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.de (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.de Wed May 18 12:53:33 2005
@@ -23,8 +23,12 @@
 <div class="toplang">
 <p><span>Verfügbare Sprachen: </span><a href="../de/mod/core.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/core.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&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>
 <table class="module"><tr><th><a href="module-dict.html#Description">Beschreibung:</a></th><td>Ständig verfügbare Kernfunktionen des Apache HTTP
 Servers</td></tr>
 <tr><th><a href="module-dict.html#Status">Status:</a></th><td>Core</td></tr></table>
@@ -3357,6 +3361,7 @@
 <div class="bottomlang">
 <p><span>Verfügbare Sprachen: </span><a href="../de/mod/core.html" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/core.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Lizenziert unter der <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.en?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.en Wed May 18 12:53:33 2005
@@ -23,6 +23,7 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/core.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Core Apache HTTP Server features that are always
@@ -946,9 +947,10 @@
     or a message. Apache will sometimes offer additional information
     regarding the problem/error.</p>
 
-    <p>URLs can begin with a slash (/) for local URLs, or be a full
-    URL which the client can resolve. Alternatively, a message can
-    be provided to be displayed by the browser. Examples:</p>
+    <p>URLs can begin with a slash (/) for local web-paths (relative
+    to the <code class="directive"><a href="#documentroot">DocumentRoot</a></code>), or be a
+    full URL which the client can resolve. Alternatively, a message
+    can be provided to be displayed by the browser. Examples:</p>
 
     <div class="example"><p><code>
       ErrorDocument 500 http://foo.example.com/cgi-bin/tester<br />
@@ -996,6 +998,14 @@
     error rather than masking it.  More information is available in
     Microsoft Knowledge Base article <a href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807">Q294807</a>.</p>
 
+    <p>Although most error messages can be overriden, there are certain
+    circumstances where the internal messages are used regardless of the
+    setting of <code class="directive"><a href="#errordocument">ErrorDocument</a></code>.  In
+    particular, if a malformed request is detected, normal request processing
+    will be immediately halted and the internal error message returned.
+    This is necessary to guard against security problems caused by
+    bad requests.</p>
+
     <p>Prior to version 2.0, messages were indicated by prefixing
     them with a single unmatched double quote character.</p>
 
@@ -3195,6 +3205,7 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/core.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>

Copied: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.es (from r170785, httpd/httpd/branches/2.0.x/docs/manual/mod/core.html.es)
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.es?p2=httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.es&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/core.html.es&r1=170785&r2=170803&rev=170803&view=diff
==============================================================================
    (empty)

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

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.ja.euc-jp
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.ja.euc-jp?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.ja.euc-jp [euc-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.html.ja.euc-jp [euc-jp] Wed May 18 12:53:33 2005
@@ -23,6 +23,7 @@
 <div class="toplang">
 <p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/core.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/core.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div>
 <div class="outofdate">This translation may be out of date. Check the
@@ -1796,8 +1797,7 @@
     大きさを必要とします。</p>
 
     <p>このディレクティブは、
-    管理者にクライアントからの異常なリクエストを制御できるようにし、
-    何らかの形のサービス拒否攻撃 (訳注:DoS) を避けるのに有効です。</p>
+    管理者にクライアントからの異常なリクエスト�鮴�罎任�襪茲Δ砲掘�    何らかの形のサービス拒否攻撃 (訳注:DoS) を避けるのに有効です。</p>
 
     <p>例:</p>
 
@@ -3192,6 +3192,7 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../de/mod/core.html" hreflang="de" rel="alternate" title="Deutsch">&nbsp;de&nbsp;</a> |
 <a href="../en/mod/core.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<a href="../es/mod/core.html" hreflang="es" rel="alternate" title="Español">&nbsp;es&nbsp;</a> |
 <a href="../ja/mod/core.html" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
 <p class="apache">Copyright 1995-2005 The Apache Software Foundation or its licensors, as applicable.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml Wed May 18 12:53:33 2005
@@ -898,9 +898,10 @@
     or a message. Apache will sometimes offer additional information
     regarding the problem/error.</p>
 
-    <p>URLs can begin with a slash (/) for local URLs, or be a full
-    URL which the client can resolve. Alternatively, a message can
-    be provided to be displayed by the browser. Examples:</p>
+    <p>URLs can begin with a slash (/) for local web-paths (relative
+    to the <directive module="core">DocumentRoot</directive>), or be a
+    full URL which the client can resolve. Alternatively, a message
+    can be provided to be displayed by the browser. Examples:</p>
 
     <example>
       ErrorDocument 500 http://foo.example.com/cgi-bin/tester<br />
@@ -949,6 +950,14 @@
     Microsoft Knowledge Base article <a
     href="http://support.microsoft.com/default.aspx?scid=kb;en-us;Q294807"
     >Q294807</a>.</p>
+
+    <p>Although most error messages can be overriden, there are certain
+    circumstances where the internal messages are used regardless of the
+    setting of <directive module="core">ErrorDocument</directive>.  In
+    particular, if a malformed request is detected, normal request processing
+    will be immediately halted and the internal error message returned.
+    This is necessary to guard against security problems caused by
+    bad requests.</p>
 
     <p>Prior to version 2.0, messages were indicated by prefixing
     them with a single unmatched double quote character.</p>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.de?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.de Wed May 18 12:53:33 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 151420 -->
+<!-- English Revision: 151420:167961 (outdated) -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation

Copied: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.es (from r170785, httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml.es)
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.es?p2=httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.es&p1=httpd/httpd/branches/2.0.x/docs/manual/mod/core.xml.es&r1=170785&r2=170803&rev=170803&view=diff
==============================================================================
    (empty)

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

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.ja?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.ja [iso-2022-jp] Wed May 18 12:53:33 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 106090:151420 (outdated) -->
+<!-- English Revision: 106090:167961 (outdated) -->
 
 <!--
  Copyright 2003-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.meta
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.meta?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.meta (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/core.xml.meta Wed May 18 12:53:33 2005
@@ -6,8 +6,9 @@
   <relpath>..</relpath>
 
   <variants>
-    <variant>de</variant>
+    <variant outdated="yes">de</variant>
     <variant>en</variant>
+    <variant outdated="yes">es</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.de
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.de?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.de (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.de Wed May 18 12:53:33 2005
@@ -108,6 +108,7 @@
 <li><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch</a></li>
 <li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
 <li><a href="mpm_common.html#bs2000account">BS2000Account</a></li>
+<li><a href="mod_log_config.html#bufferedlogs">BufferedLogs</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
 <li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
 <li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
@@ -372,6 +373,7 @@
 <li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
 <li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
 <li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><a href="mod_ssl.html#sslusername">SSLUserName</a></li>
 <li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
 <li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
 <li><a href="mpm_common.html#startservers">StartServers</a></li>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.en?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.en Wed May 18 12:53:33 2005
@@ -109,6 +109,7 @@
 <li><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch</a></li>
 <li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
 <li><a href="mpm_common.html#bs2000account">BS2000Account</a></li>
+<li><a href="mod_log_config.html#bufferedlogs">BufferedLogs</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
 <li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
 <li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
@@ -373,6 +374,7 @@
 <li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
 <li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
 <li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><a href="mod_ssl.html#sslusername">SSLUserName</a></li>
 <li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
 <li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
 <li><a href="mpm_common.html#startservers">StartServers</a></li>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.es?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.es Wed May 18 12:53:33 2005
@@ -111,6 +111,7 @@
 <li><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch</a></li>
 <li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
 <li><a href="mpm_common.html#bs2000account">BS2000Account</a></li>
+<li><a href="mod_log_config.html#bufferedlogs">BufferedLogs</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
 <li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
 <li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
@@ -375,6 +376,7 @@
 <li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
 <li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
 <li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><a href="mod_ssl.html#sslusername">SSLUserName</a></li>
 <li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
 <li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
 <li><a href="mpm_common.html#startservers">StartServers</a></li>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ja.euc-jp
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ja.euc-jp?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ja.euc-jp [euc-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ja.euc-jp [euc-jp] Wed May 18 12:53:33 2005
@@ -370,6 +370,7 @@
 <li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
 <li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
 <li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><a href="mod_ssl.html#sslusername">SSLUserName</a></li>
 <li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
 <li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
 <li><a href="mpm_common.html#startservers">StartServers</a></li>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ko.euc-kr
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ko.euc-kr?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ko.euc-kr [euc-kr] Wed May 18 12:53:33 2005
@@ -369,6 +369,7 @@
 <li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
 <li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
 <li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><a href="mod_ssl.html#sslusername">SSLUserName</a></li>
 <li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
 <li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
 <li><a href="mpm_common.html#startservers">StartServers</a></li>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ru.koi8-r
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ru.koi8-r?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ru.koi8-r [koi8-r] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/directives.html.ru.koi8-r [koi8-r] Wed May 18 12:53:33 2005
@@ -110,6 +110,7 @@
 <li><a href="mod_setenvif.html#browsermatch" id="B" name="B">BrowserMatch</a></li>
 <li><a href="mod_setenvif.html#browsermatchnocase">BrowserMatchNoCase</a></li>
 <li><a href="mpm_common.html#bs2000account">BS2000Account</a></li>
+<li><a href="mod_log_config.html#bufferedlogs">BufferedLogs</a></li>
 <li><a href="mod_cache.html#cachedefaultexpire" id="C" name="C">CacheDefaultExpire</a></li>
 <li><a href="mod_disk_cache.html#cachedirlength">CacheDirLength</a></li>
 <li><a href="mod_disk_cache.html#cachedirlevels">CacheDirLevels</a></li>
@@ -374,6 +375,7 @@
 <li><a href="mod_ssl.html#sslrequiressl">SSLRequireSSL</a></li>
 <li><a href="mod_ssl.html#sslsessioncache">SSLSessionCache</a></li>
 <li><a href="mod_ssl.html#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><a href="mod_ssl.html#sslusername">SSLUserName</a></li>
 <li><a href="mod_ssl.html#sslverifyclient">SSLVerifyClient</a></li>
 <li><a href="mod_ssl.html#sslverifydepth">SSLVerifyDepth</a></li>
 <li><a href="mpm_common.html#startservers">StartServers</a></li>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/index.html.es
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/index.html.es?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/index.html.es (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/index.html.es Wed May 18 12:53:33 2005
@@ -47,8 +47,8 @@
 <div class="section"><h2><a id="core" name="core">Funcionalidad Básica y Módulos
             de MultiProcesamiento</a></h2>
 <dl>
-<dt><a href="core.html">core</a></dt><dd>Core Apache HTTP Server features that are always
-available</dd>
+<dt><a href="core.html">core</a></dt><dd>Funcionalidades básicas del servidor HTTP Apache que
+están siempre presentes</dd>
 <dt><a href="mpm_common.html">mpm_common</a></dt><dd class="separate">Es una colección de directivas que están implementadas
 en más de un módulo de multiprocesamiento (MPM)</dd>
 <dt><a href="beos.html">beos</a></dt><dd>Este módulo de muiltiprocesamiento está

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.html.en?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.html.en Wed May 18 12:53:33 2005
@@ -47,6 +47,7 @@
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
+<li><img alt="" src="../images/down.gif" /> <a href="#bufferedlogs">BufferedLogs</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#cookielog">CookieLog</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#customlog">CustomLog</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#logformat">LogFormat</a></li>
@@ -136,7 +137,7 @@
         the status of the *original* request --- <code>%...&gt;s</code>
         for the last.</td></tr>
 <tr><td><code>%...t</code></td>
-        <td>Time, in common log format time format (standard english
+        <td>Time the request was received (standard english
         format)</td></tr>
 <tr class="odd"><td><code>%...{<var>format</var>}t</code></td>
         <td>The time, in the form given by format, which should be in
@@ -256,6 +257,29 @@
     document for details on why your security could be compromised
     if the directory where logfiles are stored is writable by
     anyone other than the user that starts the server.</p>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="BufferedLogs" id="BufferedLogs">BufferedLogs</a> <a name="bufferedlogs" id="bufferedlogs">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Buffer log entries in memory before writing to disk</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>BufferedLogs On|Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>BufferedLogs Off</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_log_config</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in versions 2.0.41 and later.</td></tr>
+</table>
+    <p>The <code class="directive">BufferedLogs</code> directive causes
+    <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> to store several log entries in
+    memory and write them together to disk, rather than writing them
+    after each request.  On some systems, this may result in more
+    efficient disk access and hence higher performance.  It may be
+    set only once for the entire server; it cannot be configured
+    per virtual-host.</p>
+
+    <div class="note">This directive is experimental and should be used with
+    caution.</div>
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="CookieLog" id="CookieLog">CookieLog</a> <a name="cookielog" id="cookielog">Directive</a></h2>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml Wed May 18 12:53:33 2005
@@ -149,7 +149,7 @@
         for the last.</td></tr>
 
     <tr><td><code>%...t</code></td>
-        <td>Time, in common log format time format (standard english
+        <td>Time the request was received (standard english
         format)</td></tr>
 
     <tr><td><code>%...{<var>format</var>}t</code></td>
@@ -284,6 +284,29 @@
     if the directory where logfiles are stored is writable by
     anyone other than the user that starts the server.</p>
 </section>
+
+<directivesynopsis>
+<name>BufferedLogs</name>
+<description>Buffer log entries in memory before writing to disk</description>
+<syntax>BufferedLogs On|Off</syntax>
+<default>BufferedLogs Off</default>
+<contextlist><context>server config</context></contextlist>
+<status>Experimental</status>
+<compatibility>Available in versions 2.0.41 and later.</compatibility>
+
+<usage>
+    <p>The <directive>BufferedLogs</directive> directive causes
+    <module>mod_log_config</module> to store several log entries in
+    memory and write them together to disk, rather than writing them
+    after each request.  On some systems, this may result in more
+    efficient disk access and hence higher performance.  It may be
+    set only once for the entire server; it cannot be configured
+    per virtual-host.</p>
+
+    <note>This directive is experimental and should be used with
+    caution.</note>
+</usage>
+</directivesynopsis>
 
 <directivesynopsis>
 <name>CookieLog</name>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ja
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ja?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ja [iso-2022-jp] Wed May 18 12:53:33 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 106090:151405 (outdated) -->
+<!-- English Revision: 106090:165672 (outdated) -->
 
 <!--
  Copyright 2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ko
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ko?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_log_config.xml.ko [euc-kr] Wed May 18 12:53:33 2005
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 106090:151405 (outdated) -->
+<!-- English Revision: 106090:165672 (outdated) -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.html.en?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.html.en Wed May 18 12:53:33 2005
@@ -1461,6 +1461,32 @@
          <strong>But be careful not to create an infinite
         loop!</strong></li>
 
+        <li>'<strong><code>nocase|NC</code></strong>'
+        (<strong>n</strong>o <strong>c</strong>ase)<br />
+         This makes the <em>Pattern</em> case-insensitive,
+        <em>i.e.</em>, there is no difference between 'A-Z' and
+        'a-z' when <em>Pattern</em> is matched against the current
+        URL.</li>
+
+        <li>
+          '<strong><code>noescape|NE</code></strong>'
+          (<strong>n</strong>o URI <strong>e</strong>scaping of
+          output)<br />
+           This flag keeps mod_rewrite from applying the usual URI
+          escaping rules to the result of a rewrite. Ordinarily,
+          special characters (such as '%', '$', ';', and so on)
+          will be escaped into their hexcode equivalents ('%25',
+          '%24', and '%3B', respectively); this flag prevents this
+          from being done. This allows percent symbols to appear in
+          the output, as in 
+<div class="example"><p><code>
+    RewriteRule /foo/(.*) /bar?arg=P1\%3d$1 [R,NE]
+</code></p></div>
+
+          which would turn '<code>/foo/zed</code>' into a safe
+          request for '<code>/bar?arg=P1=zed</code>'. 
+        </li>
+
         <li>
           '<strong><code>nosubreq|NS</code></strong>' (used only if
           <strong>n</strong>o internal

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.xml?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_rewrite.xml Wed May 18 12:53:33 2005
@@ -1481,6 +1481,32 @@
          <strong>But be careful not to create an infinite
         loop!</strong></li>
 
+        <li>'<strong><code>nocase|NC</code></strong>'
+        (<strong>n</strong>o <strong>c</strong>ase)<br />
+         This makes the <em>Pattern</em> case-insensitive,
+        <em>i.e.</em>, there is no difference between 'A-Z' and
+        'a-z' when <em>Pattern</em> is matched against the current
+        URL.</li>
+
+        <li>
+          '<strong><code>noescape|NE</code></strong>'
+          (<strong>n</strong>o URI <strong>e</strong>scaping of
+          output)<br />
+           This flag keeps mod_rewrite from applying the usual URI
+          escaping rules to the result of a rewrite. Ordinarily,
+          special characters (such as '%', '$', ';', and so on)
+          will be escaped into their hexcode equivalents ('%25',
+          '%24', and '%3B', respectively); this flag prevents this
+          from being done. This allows percent symbols to appear in
+          the output, as in 
+<example>
+    RewriteRule /foo/(.*) /bar?arg=P1\%3d$1 [R,NE]
+</example>
+
+          which would turn '<code>/foo/zed</code>' into a safe
+          request for '<code>/bar?arg=P1=zed</code>'. 
+        </li>
+
         <li>
           '<strong><code>nosubreq|NS</code></strong>' (used only if
           <strong>n</strong>o internal

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.html.en?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.html.en (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.html.en Wed May 18 12:53:33 2005
@@ -71,6 +71,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#sslrequiressl">SSLRequireSSL</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslsessioncache">SSLSessionCache</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslsessioncachetimeout">SSLSessionCacheTimeout</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sslusername">SSLUserName</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslverifyclient">SSLVerifyClient</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#sslverifydepth">SSLVerifyDepth</a></li>
 </ul>
@@ -1425,6 +1426,28 @@
 values like 300 in real life.</p>
 <div class="example"><h3>Example</h3><p><code>
 SSLSessionCacheTimeout 600
+</code></p></div>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SSLUserName" id="SSLUserName">SSLUserName</a> <a name="sslusername" id="sslusername">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Variable name to determine user name</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SSLUserName <em>varname</em></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.0.51 and later</td></tr>
+</table>
+<p>
+This directive sets the "user" field in the Apache request object.
+This is used by lower modules to identify the user with a character
+string. In particular, this may cause the environment variable
+<code>REMOTE_USER</code> to be set.  The <em>varname</em> can be
+any of the <a href="#envvars">SSL environment variables</a>.</p>
+<div class="example"><h3>Example</h3><p><code>
+SSLUserName SSL_CLIENT_S_DN_CN
 </code></p></div>
 
 </div>

Modified: httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.xml?rev=170803&r1=170802&r2=170803&view=diff
==============================================================================
--- httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/branches/mod_version_for_2.0.x/docs/manual/mod/mod_ssl.xml Wed May 18 12:53:33 2005
@@ -1490,6 +1490,27 @@
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>SSLUserName</name>
+<description>Variable name to determine user name</description>
+<syntax>SSLUserName <em>varname</em></syntax>
+<contextlist><context>server config</context>
+<context>directory</context>
+<context>.htaccess</context></contextlist>
+<override>AuthConfig</override>
+<compatibility>Available in Apache 2.0.51 and later</compatibility>
 
+<usage>
+<p>
+This directive sets the "user" field in the Apache request object.
+This is used by lower modules to identify the user with a character
+string. In particular, this may cause the environment variable
+<code>REMOTE_USER</code> to be set.  The <em>varname</em> can be
+any of the <a href="#envvars">SSL environment variables</a>.</p>
+<example><title>Example</title>
+SSLUserName SSL_CLIENT_S_DN_CN
+</example>
+</usage>
+</directivesynopsis>
 
 </modulesynopsis>



Mime
View raw message