Commit e729fe5b authored by Andre Malo's avatar Andre Malo
Browse files

mod_version_for_2.0.x branch:

* Merge r170801 to 179253 from branches/2.0.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/mod_version_for_2.0.x@179256 13f79535-47bb-0310-9956-ffa450edef68
parent 794cb873
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -7,6 +7,17 @@ Changes with Apache 2.0.55
     accompanying ap_version_t structure (minor MMN bump).
     [André Malo]
  *) worker mpm: don't take down the whole server for a transient
     thread creation failure. PR 34514 [Greg Ames]
  
  *) mod_rewrite: use buffered I/O to improve performance with large
     RewriteMap txt: files.  [Greg Ames]
  *) proxy HTTP: Rework the handling of request bodies to handle
     chunked input and input filters which modify content length, and
     avoid spooling arbitrary-sized request bodies in memory.
     PR 15859.  [Jeff Trawick]
Changes with Apache 2.0.54
  *) mod_cache: Add CacheIgnoreHeaders directive.  PR 30399.
+19 −32
Original line number Diff line number Diff line
@@ -106,9 +106,11 @@ PATCHES TO BACKPORT FROM TRUNK:
    *) Prevent hang writing to piped logger at graceful restart time.
       PR: 26467
         http://svn.apache.org/viewcvs?rev=170281&view=rev
         http://svn.apache.org/viewcvs.cgi?rev=171093&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.
           trawick: I resolved this via second commit above.  Thanks!

    *) Fix fd leak in piped logging code, fix error handling, and remove
       dead errno handling.
@@ -183,24 +185,6 @@ PATCHES TO BACKPORT FROM TRUNK:
                    have already.  *shrug*  Regardless, patch looks okay...
       +1: nd, jerenkrantz

    * Rewrite how proxy sends its request to allow input bodies to 
      morph the request bodies.  Previously, if an input filter
      changed the request body, the original C-L would be sent which
      would be incorrect.

      Due to HTTP compliance, we must either send the body T-E: chunked
      or include a C-L for the request body.  Connection: Close is not
      an option. 

      A newer version of this fix that acts even better (spools to disk) has
      been committed to trunk.  The equivalent patch for 2.0.x is at:
         http://www.apache.org/~trawick/20reqbody.txt

      +1: trawick, jerenkrantz, +1
     Previous votes (before trawick's recent 2.1 commits):
      +1: stoddard, striker, jim
      -1: brianp (we need a more robust solution than what's in 2.1 right now),

    * support/check_forensic: Fix tempfile usage
      svn rev 125495, 126224
      jerenkrantz says: r126224 fixes brokenness with r125495 on Solaris.
@@ -220,7 +204,7 @@ PATCHES TO BACKPORT FROM TRUNK:

    * 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 
      +1: pquerna, nd
      Votes from before the integration branch:
          +1: jerenkrantz, wrowe (trivial, would even be cool in 1.3)

@@ -254,21 +238,24 @@ PATCHES TO BACKPORT FROM TRUNK:
     *) 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
        +1: jorton, bnicholes, 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

     *) fix z/OS annoyance with pathname on debug messages in error log
        http://svn.apache.org/viewcvs?rev=178299&view=rev
        +1: trawick

     *) EBCDIC: Handle chunked input from client or, with proxy, origin
        server.
        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

     *) 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

PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:

+10 −0
Original line number Diff line number Diff line
@@ -94,6 +94,16 @@ if test "$apu_found" = "no"; then
  AC_MSG_ERROR([APR-util not found.  Please read the documentation.])
fi

# Catch some misconfigurations:
case ${apr_found}.${apu_found} in
reconfig.yes)
  AC_MSG_ERROR([Cannot use an external APR-util with the bundled APR])
  ;;
yes.reconfig)
  AC_MSG_ERROR([Cannot use an external APR with the bundled APR-util])
  ;;
esac  

if test "$apu_found" = "reconfig"; then
  APR_SUBDIR_CONFIG(srclib/apr-util,
                    [--with-apr=../apr --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir],
+0 −1
Original line number Diff line number Diff line
@@ -930,7 +930,6 @@ AddHandler type-map var
#    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
+0 −186
Original line number Diff line number Diff line
Content-language: cs
Content-type: text/html; charset=ISO-8859-2
Body:----------cs--
<!--#set var="CONTENT_LANGUAGE" value="cs"
--><!--#set var="CHARACTER_ENCODING" value="ISO-8859-2"
--><!--#set var="TITLE" value="Nenalezen dn akceptovateln objekt!"
--><!--#include virtual="include/top.html" -->

    Adekvtn reprezentace poadovenho zdroje
    nebyla na tomto serveru nalezena.

<!--#include virtual="include/bottom.html" -->
----------cs--

Content-language: de
Content-type: text/html; charset=ISO-8859-1
Body:----------de--
<!--#set var="CONTENT_LANGUAGE" value="de"
--><!--#set var="TITLE" value="Kein passendes Objekt gefunden!"
--><!--#include virtual="include/top.html" -->

    Unter dem angeforderten URL konnte kein geeignetes Objekt
    auf dem Server gefunden werden, das dem vom Browser
    geforderten Format entsprechen w&uuml;rde. 

<!--#include virtual="include/bottom.html" -->
----------de--

Content-language: en
Content-type: text/html; charset=ISO-8859-1
Body:----------en--
<!--#set var="TITLE" value="No acceptable object found!"
--><!--#include virtual="include/top.html" -->

    An appropriate representation of the requested resource
    could not be found on this server.

<!--#include virtual="include/bottom.html" -->
----------en--

Content-language: es
Content-type: text/html; charset=ISO-8859-1
Body:----------es--
<!--#set var="CONTENT_LANGUAGE" value="es"
--><!--#set var="TITLE" value="&iexcl;No se encontr&oacute; ning&uacute; objeto aceptable!"
--><!--#include virtual="include/top.html" -->

	Una representaci&oacute;n apropiada de los recursos 
	solicitados no ha podido ser localizada en 
	este servidor.

<!--#include virtual="include/bottom.html" -->
----------es--

Content-language: fr
Content-type: text/html; charset=ISO-8859-1
Body:----------fr--
<!--#set var="CONTENT_LANGUAGE" value="fr"
--><!--#set var="TITLE" value="L'objet trouv&eacute; n'est pas acceptable!"
--><!--#include virtual="include/top.html" -->

    Une repr&eacute;sentation appropri&eacute;e de la ressource requise
    n'a pu &ecirc;tre trouv&eacute;e sur ce serveur.

<!--#include virtual="include/bottom.html" -->  
----------fr--

Content-language: it
Content-type: text/html; charset=ISO-8859-1
Body:----------it--
<!--#set var="CONTENT_LANGUAGE" value="it"
--><!--#set var="TITLE" value="Nessun oggetto accettabile!"
--><!--#include virtual="include/top.html" -->

    Questo server non riesce a trovare una rappresentazione
    appropriata per la risorsa richiesta.

<!--#include virtual="include/bottom.html" -->
----------it--

Content-language: ja
Content-type: text/html; charset=ISO-2022-JP
Body:----------ja--
<!--#set var="CONTENT_LANGUAGE" value="ja"
--><!--#set var="CHARACTER_ENCODING" value="iso-2022-jp"
--><!--#set var="TITLE" value="No acceptable object found!"
--><!--#include virtual="include/top.html" -->

    要求されたリソースの適切な表現は、
    本サーバには見つかりませんでした。

<!--#include virtual="include/bottom.html" -->
----------ja--

Content-language: ko
Content-type: text/html; charset=EUC-KR
Body:----------ko--
<!--#set var="CONTENT_LANGUAGE" value="ko"
--><!--#set var="TITLE" value="  !"
--><!--#set var="CHARACTER_ENCODING" value="EUC-KR"
--><!--#include virtual="include/top.html" -->

            .

<!--#include virtual="include/bottom.html" -->
----------ko--

Content-language: nl
Content-type: text/html; charset=ISO-8859-1
Body:----------nl--
<!--#set var="CONTENT_LANGUAGE" value="nl"
--><!--#set var="TITLE" value="Geen acceptabel object gevonden!"
--><!--#include virtual="include/top.html" -->

    Een toereikende representatie van het gevraagde object
    kon niet gevonden worden op deze server.

<!--#include virtual="include/bottom.html" -->
----------nl--

Content-language: pl
Content-type: text/html; charset=ISO-8859-2
Body:----------pl--
<!--#set var="CONTENT_LANGUAGE" value="pl"
--><!--#set var="TITLE" value="Brak akceptowalnego obiektu!"
--><!--#set var="CHARACTER_ENCODING" value="ISO-8859-2"
--><!--#include virtual="include/top.html" -->

    Nie znaleziono akceptowalnego obiektu reprezentujcego
    dany zasb.

<!--#include virtual="include/bottom.html" -->
----------pl--

Content-language: pt-br
Content-type: text/html; charset=ISO-8859-1
Body:-------pt-br--
<!--#set var="CONTENT_LANGUAGE" value="pt-br"
--><!--#set var="TITLE" value="Objeto apropriado n&atilde;o encontrado!"
--><!--#include virtual="include/top.html" -->

    N&atilde;o existe uma representa&ccedil;&atilde;o apropriada
    para o recurso requisitado neste servidor.

<!--#include virtual="include/bottom.html" -->
-------pt-br--

Content-language: ro
Content-type: text/html; charset=ISO-8859-1
Body:----------ro--
<!--#set var="CONTENT_LANGUAGE" value="ro"
--><!--#set var="TITLE" value="Nici un obiect acceptabil gasit!"
--><!--#include virtual="include/top.html" -->

    Nici o reprezentare potrivita a resursei cerute
    nu a putut fi gasita pe acest server.

<!--#include virtual="include/bottom.html" -->
----------ro--

Content-language: sv
Content-type: text/html; charset=ISO-8859-1
Body:----------sv--
<!--#set var="CONTENT_LANGUAGE" value="sv"
--><!--#set var="TITLE" value="Inget acceptabelt objekt hittat!"
--><!--#include virtual="include/top.html" -->

    En l&auml;mplig representation av den efterfr&aring;gade
    resursen kunde inte hittas p&aring; denna server.

<!--#include virtual="include/bottom.html" -->
----------sv--

Content-language: tr
Content-type: text/html; charset=ISO-8859-9
Body:----------tr--
<!--#set var="CONTENT_LANGUAGE" value="tr"
--><!--#set var="CHARACTER_ENCODING" value="ISO-8859-9"
--><!--#set var="TITLE" value="No acceptable object found!"
--><!--#include virtual="include/top.html" -->

    Sunucu zerinde, talep etti&#287;iniz kayna&#287;&#305;n
    uygun bir kar&#351;&#305;l&#305;&#287;&#305; bulunamad&#305;.

<!--#include virtual="include/bottom.html" -->
----------tr--
Loading