update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789263 13f79535-47bb-0310-9956-ffa450edef68

Support Apache badge: fix up hover and margin

Also add an alt-tag so validate-xhtml doesn't complain.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789248 13f79535-47bb-0310-9956-ffa450edef68

docs: update

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789247 13f79535-47bb-0310-9956-ffa450edef68

Merge r1776459, r1788508 from trunk:

PR59938: add %{REMOTE_PORT} to the expression parser

Submitted By: Hank Ibell <hwibell gmail.com>

compat note for REMOTE_PORT

Submitted by: covener
Reviewed by: covener, ylavic, jchampion

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789244 13f79535-47bb-0310-9956-ffa450edef68

Vote, move.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789241 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789238 13f79535-47bb-0310-9956-ffa450edef68

Revert r1789213 and r1789214: wrong branch...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789215 13f79535-47bb-0310-9956-ffa450edef68

Follow up to r1789213: more accurate CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789214 13f79535-47bb-0310-9956-ffa450edef68

core: Disallow multiple Listen on the same IP:port when listener buckets
are configured (ListenCoresBucketsRatio > 0), consistently with the single
bucket case (default), thus fixing the leak of the corresponding socket
descriptors on graceful restart.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789213 13f79535-47bb-0310-9956-ffa450edef68

Add logo, link to "Support Apache" page, as per
request from Marketing.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789132 13f79535-47bb-0310-9956-ffa450edef68

Withdraw proposal for now, I can't reproduce the leak w/o the patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789068 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1789063 13f79535-47bb-0310-9956-ffa450edef68

Propose easy votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788831 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788730 13f79535-47bb-0310-9956-ffa450edef68

XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788729 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788726 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788725 13f79535-47bb-0310-9956-ffa450edef68

XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788724 13f79535-47bb-0310-9956-ffa450edef68

Fix typo spotted by angeloxx (r1788719 in trunk)

+ synch with trunk to improve syntax highlight

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788723 13f79535-47bb-0310-9956-ffa450edef68

Fix typo spotted by angeloxx (r1788719 in trunk)

+ synch with trunk to improve syntax highlight

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788722 13f79535-47bb-0310-9956-ffa450edef68

Update backport for PROXY protocol

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788675 13f79535-47bb-0310-9956-ffa450edef68

Vote/note.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788528 13f79535-47bb-0310-9956-ffa450edef68

Merge r1783842 from trunk:

mod_cache: Fix a regression in 2.4.25 for the forward proxy case by
computing and using the same entity key according to when the cache
checks, loads and saves the request.  PR 60577.

Submitted by: ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788511 13f79535-47bb-0310-9956-ffa450edef68

Merge r1779573 from trunk:

mod_proxy_hcheck: thread-safety.
Use the thread pool everywhere for the needs/lifetime of the request to
the backend.

Submitted by: ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788510 13f79535-47bb-0310-9956-ffa450edef68

add compat revisions

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788509 13f79535-47bb-0310-9956-ffa450edef68

vote/promote some of the bigger backports

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788507 13f79535-47bb-0310-9956-ffa450edef68

address comment re: strncasecmp, thanks Bill.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788452 13f79535-47bb-0310-9956-ffa450edef68

Merge r1780095 from trunk:

Fix %{DOCUMENT_URI} in SSI w/ default parser

  *) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the
     URI originally requsted by the user, not the nested documents URI. This
     restores the behavior of this variable to match the "legacy" SSI parser.
     PR60624.

Submitted By [Hank Ibell <hwibell gmail.com>]

Submitted by: covener
Reviewed by: covener, wrowe, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788448 13f79535-47bb-0310-9956-ffa450edef68

Merge r1777354 from trunk:

old IBM EBCDIC fix that never got shared.

Submitted by: covener
Reviewed by: covener, wrowe, ylavic (by inspection)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788447 13f79535-47bb-0310-9956-ffa450edef68

Merge r1780328, r1780329, r1781329, r1782164, r1782166, r1782193, r1778350, r1781329, r1782194, r1782323, r1782418, r1782419, r1782482, r1782532, r1788040 from trunk:

Adjust as needed

debugging

add ProxyFCGISetEnvIf

Logging update

Follow up to r1782164: fix typo (closing double-quote).

Remove trailing whitespace : no functional change

PR60576: php-fpm broken w/ per-dir rewrites

Attempt to dig out of well-meaning fixes for generic fcgi backends
that negatively affected some FPM configs.

Adds ProxyFCGIBackendType

add ProxyFCGISetEnvIf

trailing whitespace

Allow final admin-level fine-tuning

mod_proxy_fcgi: fix spelling in APLOG_INFO message

mod_proxy_fcgi: allow setting empty variables in ProxyFCGISetEnvIf

support unsetting vars

ProxyFCGISetEnvIf: reject invalid invocations, streamline unsets

Neither of the following makes sense:
- ProxyFCGISetEnvIf cond !VARIABLE value
- ProxyFCGISetEnvIf cond !

Error out in these cases. Also, don't execute the (unused) replacement
expression when unsetting.

drop the longhand version

Submitted by: jim, covener, jim, ylavic, jim, covener, covener, jim, jim, jchampion, jchampion, covener, jchampion, covener
Reviewed by: jim, covener, jchampion

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788445 13f79535-47bb-0310-9956-ffa450edef68

addressed and promoted

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788444 13f79535-47bb-0310-9956-ffa450edef68

Merge r1781187, r1781190, r1781312 from trunk:

mod_ssl: work around leaks on (graceful) restart.

Tested with valgrind and --with-ssl shared/static.

mod_ssl: follow up to r1781187.
The ssl_util_thread_*() functions are not necessary with openssl-1.1+

mod_ssl: follow up to r1781187.
Address SSL_CTX leak in (merged) proxy_ctx.

Reviewed by: ylavic, jim, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788442 13f79535-47bb-0310-9956-ffa450edef68

Vote, promote, note.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788435 13f79535-47bb-0310-9956-ffa450edef68

I'm wrong. Reviewing SecurityPolicy (2.0.13 + 1.2.4) at
https://www.openssl.org/docs/fips/ - using FIPS_mode_set(1) for revalidation
was actually expressly called out in section 3. While mod_ssl is 'unloaded'
(unconfigured) the process is not operating in a fips validated manner, but
once the configuration resets FIPS_mode_set(1) it resumes validated behavior.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788258 13f79535-47bb-0310-9956-ffa450edef68

Multiple comments

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788257 13f79535-47bb-0310-9956-ffa450edef68

Fix some typo and add a few comments about missing compatibility information

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788060 13f79535-47bb-0310-9956-ffa450edef68

add rev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788041 13f79535-47bb-0310-9956-ffa450edef68

propose a few small patches

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788039 13f79535-47bb-0310-9956-ffa450edef68

Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788015 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787942 13f79535-47bb-0310-9956-ffa450edef68

note this

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787941 13f79535-47bb-0310-9956-ffa450edef68

Merge r1787053 from trunk:

donating lua server-status script, enjoy!
Submitted by: humbedooh
Reviewed by: humbedooh

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787940 13f79535-47bb-0310-9956-ffa450edef68

Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787737 13f79535-47bb-0310-9956-ffa450edef68

Merge r1787510 from trunk:

Add a warning in the docs about nested <If> blocks

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787736 13f79535-47bb-0310-9956-ffa450edef68

Merge ^/httpd/httpd/branches/2.4.x-openssl-1.1.0-compat:

Support OpenSSL 1.1.0

Proposed by: rjung
Reviewed by: wrowe, jorton, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787728 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787567 13f79535-47bb-0310-9956-ffa450edef68

XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787566 13f79535-47bb-0310-9956-ffa450edef68

vote for openssl 1.1.0 patch

nowhere to go but forward. Passes regression on 1.1.0 and on earlier openssl.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787527 13f79535-47bb-0310-9956-ffa450edef68

Formatting fixes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787303 13f79535-47bb-0310-9956-ffa450edef68

Backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787302 13f79535-47bb-0310-9956-ffa450edef68

Merge r1777923 from trunk:

avoid SO_REUSEPORT w/o ListenCoresBucketsRatio

Can lead to unintended/confusing sharing between
multiple servers started by the same ID.

Submitted by: covener
Reviewed by: jorton, covener, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787301 13f79535-47bb-0310-9956-ffa450edef68

Still need to respond on-list, several concerns satisifed, some remain

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787249 13f79535-47bb-0310-9956-ffa450edef68

One for immediate backport. No commits towards 0.6 brotoli since the 10th

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787248 13f79535-47bb-0310-9956-ffa450edef68

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787104 13f79535-47bb-0310-9956-ffa450edef68

meant to backport this

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787103 13f79535-47bb-0310-9956-ffa450edef68

SO_REUSEPORT on by default is a regression.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1787005 13f79535-47bb-0310-9956-ffa450edef68

Tested with 1.1.0e and 1.0.2k.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786993 13f79535-47bb-0310-9956-ffa450edef68

Documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786896 13f79535-47bb-0310-9956-ffa450edef68

Merge r1786709 from trunk:

Add a note in the docs about evaluation of Location sections

The sections.html doc was missing, in my opinion, a direct
reference to the fact multiple Location blocks matching
a HTTP request will be evaluated in the order in which they
appear in the configuration files (same as Ifs, etc..).

Reworked a bit a single block of text to be a bit more readable.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786895 13f79535-47bb-0310-9956-ffa450edef68

remove h2_bucket_eoc per r1779742

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786831 13f79535-47bb-0310-9956-ffa450edef68

Rebuild 2.4 howtos directory. Cross-link to Rewrite section

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786687 13f79535-47bb-0310-9956-ffa450edef68

Phrasing update from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786684 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786601 13f79535-47bb-0310-9956-ffa450edef68

XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786600 13f79535-47bb-0310-9956-ffa450edef68

On the 2.4.x branch:

 Merged /httpd/httpd/trunk:r1784571,1785672,1785683,1786512,1786575-1786576
 mod_http2/mod_proxy_http2 backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786582 13f79535-47bb-0310-9956-ffa450edef68

Fix some spelling errors in comments

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786397 13f79535-47bb-0310-9956-ffa450edef68

convenience patch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786022 13f79535-47bb-0310-9956-ffa450edef68

and final touch

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1786010 13f79535-47bb-0310-9956-ffa450edef68

add

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785987 13f79535-47bb-0310-9956-ffa450edef68

Propose for backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785953 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785910 13f79535-47bb-0310-9956-ffa450edef68

Merge r1785907 from trunk:

compat inline for no-proxy

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785909 13f79535-47bb-0310-9956-ffa450edef68

Merge r1785752, r1785753 from trunk:

configure: remove mod_lua code duplication

Pull identical code into the CHECK_LUA_PATH macro.

configure: check for luaL_register in liblua

This is a temporary workaround for a missing compatibility API on
Debian-like systems (and anyone else who doesn't compile with
LUA_COMPAT_MODULE). Ignore any such libraries so we don't fail
confusingly later.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785875 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785499 13f79535-47bb-0310-9956-ffa450edef68

XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785498 13f79535-47bb-0310-9956-ffa450edef68

Merge r1785115 from trunk:

Look for specific versioned installs of Lua 5.3
Reviewed by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1785116 13f79535-47bb-0310-9956-ffa450edef68

Backport of Lua exhancements from trunk, mostly to support 5.3

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784990 13f79535-47bb-0310-9956-ffa450edef68

documentation rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784915 13f79535-47bb-0310-9956-ffa450edef68

Merge r1784912 from trunk:

Fix upgrading documentation for PR 60794

Require 127.0.0.1 is not a valid syntax,
fixing it with Require local

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784914 13f79535-47bb-0310-9956-ffa450edef68

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784569 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784396 13f79535-47bb-0310-9956-ffa450edef68

XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784395 13f79535-47bb-0310-9956-ffa450edef68

On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1784002,1784366,1784372

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784374 13f79535-47bb-0310-9956-ffa450edef68

rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784328 13f79535-47bb-0310-9956-ffa450edef68

Link to the directives quickreference, which has the context listed
inline, as per user-submitted comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784326 13f79535-47bb-0310-9956-ffa450edef68

add't entry

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784276 13f79535-47bb-0310-9956-ffa450edef68

Use single watchdog instance and threadpool

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784229 13f79535-47bb-0310-9956-ffa450edef68

backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784213 13f79535-47bb-0310-9956-ffa450edef68

On the 2.4.x branch:

merge of r1783683,1783693,1783756,1783759-1783760,1783762,1783912,1783996 from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1784001 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783843 13f79535-47bb-0310-9956-ffa450edef68

Merge r1783722, r1783723 from trunk:

Fix ProxyPassReverse schemes in mod_proxy_http2's doc (examples).

build doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783726 13f79535-47bb-0310-9956-ffa450edef68

propose fix for PR 46037.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783668 13f79535-47bb-0310-9956-ffa450edef68

Merge r1775858 from trunk:

Return HTTP 504 rather than 503 when a proxy timeout is hit.

Part of the review for PR: 56188

Submitted by: elukey
Reviewed by: elukey, jim, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783414 13f79535-47bb-0310-9956-ffa450edef68

Merge r1774541 from trunk:

event: close a race condition where we might re-enable listeners while they
are already or about to be closed.

Submitted by: ylavic
Reviewed by: ylavic, jim, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783413 13f79535-47bb-0310-9956-ffa450edef68

vote promote change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783412 13f79535-47bb-0310-9956-ffa450edef68

ACK very low hanging fruit

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783276 13f79535-47bb-0310-9956-ffa450edef68

i

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783274 13f79535-47bb-0310-9956-ffa450edef68

Wondering why the obstruction?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783271 13f79535-47bb-0310-9956-ffa450edef68

Slow two still-wobbly horses

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783256 13f79535-47bb-0310-9956-ffa450edef68

Update... one show stopper was fixed, the other has 2 votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1783123 13f79535-47bb-0310-9956-ffa450edef68