delta/apache/httpd.git/modules/proxy/mod_proxy_ftp.c, branch 2.4.17-protocols-changes

Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

2015-09-08T11:10:16+00:00

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting


Silence a sparse warning about inconsistent indenting + some minor style issues

Remove useless line

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues
Submitted by: jailletc36
Reviewed/backported by: jim


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

Merge r1633031, r1633522, r1633529, r1633530 from trunk

2014-11-01T15:21:33+00:00

Style fix

Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
Backported by: jailletc36

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

Merge r1597642, r1608999, r1605207, r1610366, r1610353, r1611871 from trunk:

2014-09-05T14:19:29+00:00

Rename module name in doxygen + partly revert r832442 which skipped doxygen doc generation for 'mod_watchdog.h'

s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles

Use ap_remove_input_filter_byhandle instead of duplicating the code.

Remove some 'register' in variable declaration.

Remove some 'register' in variable declaration.
Save a few cycles by calling 'apr_isalnum' instead of 'apr_isalpha' and 'apr_isdigit'.

Do not use deprecated define.

No change in generated code because MODULE_MAGIC_NUMBER is defined as:
   #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR
Submitted by: jailletc36
Reviewed/backported by: jim


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

Merge r1615026 from trunk:

2014-08-31T16:06:36+00:00

Turn some APR_BUCKET_REMOVE(e)+apr_bucket_destroy(e) into the equivalent apr_bucket_delete(e) to reduce code verbosity

Submitted by: jailletc36
Reviewed/backported by: jim


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

Merge r1551714 from trunk:

2014-01-05T16:15:38+00:00

Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead.

Save 8k of stack by the same time.
Submitted by: jailletc36
Reviewed/backported by: jim


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

Merged r1423353, r1428280 from trunk:

2013-01-07T16:04:56+00:00

* modules/proxy/mod_proxy_ftp.c: Fill in APLOGNO.

* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Remove
  unnecessary APLOGNO() for trace logging per dev@ discussion.

Reviewed by: jorton, covener, sf


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

mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records.

2012-12-16T13:57:38+00:00

PR 40841.

trunk patch: http://svn.apache.org/viewvc?rev=1404625&view=rev
             http://svn.apache.org/viewvc?rev=1420223&view=rev
2.4.x patch: http://people.apache.org/~jorton/proxyftpepsv-24.patch
Submitted by: jorton
Reviewed by: jim, minfrin


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

Merge r1413732, r1418752:

2012-12-09T13:28:04+00:00

various mods: host and URI escaping:

    Be sure to escape potential troubled strings

    add missing html escaping

Submitted by: jim, sf
Reviewed by: covener, minfrin, sf



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

Merge r1361801 from trunk:

2012-08-14T20:57:43+00:00

Various code clean up

Submitted by: Christophe JAILLET 
PR: 52893 

Submitted by: sf
Reviewed/backported by: jim


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

* mod_proxy*: ProxyBlock fixes; PR 43697 and more.

2012-07-28T14:40:23+00:00

        trunk patch: http://svn.apache.org/viewvc?rev=1365001&view=rev and
                          http://svn.apache.org/viewvc?rev=1365020&view=rev and
                                            http://svn.apache.org/viewvc?rev=1365029&view=rev
                                                 2.4.x patch: http://people.apache.org/~jorton/ap_proxyblock-24x-v2.diff [avoids major MMN bump]
                                                      +1: jorton, rjung, jim



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