From: André Malo Date: Tue, 31 May 2005 18:30:56 +0000 (+0000) Subject: mod_version_for_2.0.x branch: X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb7511b595bc4318769d6ad8a8400f58484899eb;p=thirdparty%2Fapache%2Fhttpd.git 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 --- diff --git a/CHANGES b/CHANGES index 2195550bc68..234e15a147f 100644 --- a/CHANGES +++ b/CHANGES @@ -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. diff --git a/STATUS b/STATUS index 0f572529205..c0533dac208 100644 --- a/STATUS +++ b/STATUS @@ -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: diff --git a/configure.in b/configure.in index fffc863f4d8..f1cccd46ea0 100644 --- a/configure.in +++ b/configure.in @@ -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], diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in index 2a37a6bb6a5..2c15753b906 100644 --- a/docs/conf/httpd-std.conf.in +++ b/docs/conf/httpd-std.conf.in @@ -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 diff --git a/docs/error/HTTP_NOT_ACCEPTABLE.html.var b/docs/error/HTTP_NOT_ACCEPTABLE.html.var deleted file mode 100644 index 28e99822eb3..00000000000 --- a/docs/error/HTTP_NOT_ACCEPTABLE.html.var +++ /dev/null @@ -1,186 +0,0 @@ -Content-language: cs -Content-type: text/html; charset=ISO-8859-2 -Body:----------cs-- - - - Adekvátní reprezentace po¾adoveného zdroje - nebyla na tomto serveru nalezena. - - -----------cs-- - -Content-language: de -Content-type: text/html; charset=ISO-8859-1 -Body:----------de-- - - - Unter dem angeforderten URL konnte kein geeignetes Objekt - auf dem Server gefunden werden, das dem vom Browser - geforderten Format entsprechen würde. - - -----------de-- - -Content-language: en -Content-type: text/html; charset=ISO-8859-1 -Body:----------en-- - - - An appropriate representation of the requested resource - could not be found on this server. - - -----------en-- - -Content-language: es -Content-type: text/html; charset=ISO-8859-1 -Body:----------es-- - - - Una representación apropiada de los recursos - solicitados no ha podido ser localizada en - este servidor. - - -----------es-- - -Content-language: fr -Content-type: text/html; charset=ISO-8859-1 -Body:----------fr-- - - - Une représentation appropriée de la ressource requise - n'a pu être trouvée sur ce serveur. - - -----------fr-- - -Content-language: it -Content-type: text/html; charset=ISO-8859-1 -Body:----------it-- - - - Questo server non riesce a trovare una rappresentazione - appropriata per la risorsa richiesta. - - -----------it-- - -Content-language: ja -Content-type: text/html; charset=ISO-2022-JP -Body:----------ja-- - - - $BMW5a$5$l$?%j%=!<%9$NE,@Z$JI=8=$O!"(B - $BK\%5!<%P$K$O8+$D$+$j$^$;$s$G$7$?!#(B - - -----------ja-- - -Content-language: ko -Content-type: text/html; charset=EUC-KR -Body:----------ko-- - - - ¿äûÇÑ °´Ã¼ÀÇ Àû´çÇÑ ÇüŸ¦ ÀÌ ¼­¹ö¿¡¼­ ãÀ» ¼ö ¾ø½À´Ï´Ù. - - -----------ko-- - -Content-language: nl -Content-type: text/html; charset=ISO-8859-1 -Body:----------nl-- - - - Een toereikende representatie van het gevraagde object - kon niet gevonden worden op deze server. - - -----------nl-- - -Content-language: pl -Content-type: text/html; charset=ISO-8859-2 -Body:----------pl-- - - - Nie znaleziono akceptowalnego obiektu reprezentuj±cego - ¿±dany zasób. - - -----------pl-- - -Content-language: pt-br -Content-type: text/html; charset=ISO-8859-1 -Body:-------pt-br-- - - - Não existe uma representação apropriada - para o recurso requisitado neste servidor. - - --------pt-br-- - -Content-language: ro -Content-type: text/html; charset=ISO-8859-1 -Body:----------ro-- - - - Nici o reprezentare potrivita a resursei cerute - nu a putut fi gasita pe acest server. - - -----------ro-- - -Content-language: sv -Content-type: text/html; charset=ISO-8859-1 -Body:----------sv-- - - - En lämplig representation av den efterfrågade - resursen kunde inte hittas på denna server. - - -----------sv-- - -Content-language: tr -Content-type: text/html; charset=ISO-8859-9 -Body:----------tr-- - - - Sunucu üzerinde, talep ettiğiniz kaynağın - uygun bir karşılığı bulunamadı. - - -----------tr-- diff --git a/docs/manual/install.html.de b/docs/manual/install.html.de index 5660acc2bfb..757042f6a62 100644 --- a/docs/manual/install.html.de +++ b/docs/manual/install.html.de @@ -25,6 +25,9 @@  ko  |  ru 

+
Diese Übersetzung ist möglicherweise + nicht mehr aktuell. Bitte prüfen Sie die englische Version auf + die neuesten Änderungen.

Dieses Dokument umfaßt nur die Kompilierung und Installation des Apache auf Unix und Unix-ähnlichen Systemen. Für die diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en index 4ac48432bb7..af5d95e021c 100644 --- a/docs/manual/install.html.en +++ b/docs/manual/install.html.en @@ -345,14 +345,15 @@ $ tar xvf httpd-2_0_NN.tar work. (This is only valid for versions after 2.0.41; earlier versions have incompatible changes.)

-

If you kept the source tree from your last installation, - upgrading is even easier. The file config.nice in - the root of the old source tree contains the exact - configure command line that you used to configure the - source tree. Then to upgrade from one version to the next, you - need only copy the config.nice file to the source - tree of the new version, edit it to make any desired changes, and - then run:

+

To upgrade across minor versions, start by finding the file + config.nice in the build directory of + your installed server or at the root of the source tree for your + old install. This will contain the exact + configure command line that you used to + configure the source tree. Then to upgrade from one version to + the next, you need only copy the config.nice file to + the source tree of the new version, edit it to make any desired + changes, and then run:

$ ./config.nice
diff --git a/docs/manual/install.html.es b/docs/manual/install.html.es index 38b44fb4a26..51709732741 100644 --- a/docs/manual/install.html.es +++ b/docs/manual/install.html.es @@ -25,6 +25,10 @@  ko  |  ru 

+
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.

Este documento explica cómo compilar e instalar Apache en diff --git a/docs/manual/install.xml b/docs/manual/install.xml index 6cff66f2d4c..5bf04843502 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -353,14 +353,15 @@ $ tar xvf httpd-2_0_NN.tar work. (This is only valid for versions after 2.0.41; earlier versions have incompatible changes.)

-

If you kept the source tree from your last installation, - upgrading is even easier. The file config.nice in - the root of the old source tree contains the exact - configure command line that you used to configure the - source tree. Then to upgrade from one version to the next, you - need only copy the config.nice file to the source - tree of the new version, edit it to make any desired changes, and - then run:

+

To upgrade across minor versions, start by finding the file + config.nice in the build directory of + your installed server or at the root of the source tree for your + old install. This will contain the exact + configure command line that you used to + configure the source tree. Then to upgrade from one version to + the next, you need only copy the config.nice file to + the source tree of the new version, edit it to make any desired + changes, and then run:

$ ./config.nice
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index 899535bd099..372c54a2f87 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -1,7 +1,7 @@ - + + + + +