Checkout Tools
  • last updated 41 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge r1612945, r1734835, r1738875, r1833416, r1842898, r1867257, r1876745, r1876807, r1876823, r1877642 from trunk

Easy patches: synch 2.4.x and trunk

- core: Re-introduce check for sufficient PCRE version.

- core: Fix doc string for QualifyRedirectURL

- mod_proxy: really return an error message on invalid "flusher" value.

- mod_http2: Remove extra and un-needed ""

- mod_ldap: fix a (unlikely) memory leak

- ab: fix a typo

- suexec: Report error string after failure from setgid/initgroups or setuid

- mod_session_crypto: be less specific and don't echo passphrase

- mod_proxy_html: Fix proxy_html_conf.bufsz to have correct type, as

it is used with ap_set_int_slot.

- mod_md: update duplicated APLOGNOs.

Submitted by: fuankg, trawick, ylavic, jailletc36, jorton, jailletc36, jorton, covener, jorton, ylavic

Reviewed by: jailletc36, jim, ylavic

Backported by: jailletc36

  1. … 10 more files in changeset.
Merge r1873985 from trunk:

Fix spelling errors found by codespell. [skip ci]

Submitted by: mrumph

Reviewed by: mrumph, jim, ylavic

  1. … 90 more files in changeset.
ab: Add client certificate support.

trunk: http://svn.apache.org/r1841784

2.4.x: svn merge -c r1841784 ^/httpd/httpd/trunk .

+1: minfrin, jim, ylavic

  1. … 4 more files in changeset.
  1. … 2 more files in changeset.
Merge 1626956 and 1628388 from trunk:

ab: try all destination socket addresses returned by apr_sockaddr_info_get

instead of failing on first one when not available.

Needed for instance if localhost resolves to both ::1 and 127.0.0.1

e.g. if both are in /etc/hosts.

ab: Use only one connection to determine working destination socket address.

Submitted by: rjung

Reviewed by: rjung, covener, ylavic

  1. … 2 more files in changeset.
Merge 1821767 from trunk:

LibreSSL doesn't have or require applink.c

Submitted by: rjung

Reviewed by: rjung, ylavic, covener

  1. … 3 more files in changeset.
Merge r1617913 from trunk:

* support/ab.c: Fix crash caused by integer overflow when printing stats with

lot of requests (for example -n 500000000).

Submitted by: jkaluza

Reviewed by: jorton, jim, ylavic

  1. … 2 more files in changeset.
ab: Fix send length calculation

... for the non-blocking connect case introduced in 2.4.30.

Submitted By: jorton

Reviewed By: ylavic, druggeri, covener

  1. … 1 more file in changeset.
On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1811649,1811664,1814118

*) ab: Make the TLS layer aware that the underlying socket is nonblocking,

and use/handle POLLOUT where needed to avoid busy IOs and recover write

errors when appropriate. [Yann Ylavic]

*) ab: Keep reading nonblocking to exhaust TCP or SSL buffers when previous

read was incomplete (the SSL case can cause the next poll() to timeout

since data are buffered already). PR 61301 [Luca Toscano, Yann Ylavic]

  1. … 3 more files in changeset.
Merge r1803392, r1803396, r1803398 from trunk:

mod_ssl: we can't use SSL_COMP_free_compression_methods() if OPENSSL_NO_COMP

is defined. PR 61206.

Submitted by: Michael Schlenker <msc contact.de>

mod_ssl, ab: compatibility with LibreSSL. PR 61184.

LibreSSL defines OPENSSL_VERSION_NUMBER = 2.0, but is not compatible with

all of the latest OpenSSL 1.1 API.

Address this by defining MODSSL_USE_OPENSSL_PRE_1_1_API which is true for

anything but OpenSSL >= 1.1 (for now).

Proposed by: Bernard Spil <brnrd freebsd.org>

Reviewed by: ylavic

Follow up to r1803396: CHANGES entry.

Reviewed by: ylavic, jim, covener

  1. … 10 more files in changeset.
Merge r1796493 from trunk:

ab: enable option processing for setting a custom

HTTP method also for non-SSL builds.

Submitted by: rjung

Reviewed by: rjung, covener, gsmith

  1. … 3 more files in changeset.
Merge r1795830 from trunk:

ab: don't call malloc_init for OpenSSL 1.1.0

Patch by rjung.

The 1.1.0 compatibility macro for OpenSSL_malloc_init() causes problems

when mixed with procedure linkage stubs with some toolchains (e.g. GCC).

OpenSSL's malloc implementation doesn't recognize that the PLT stub

points back to it, which leads to infinite recursion.

Since the 1.1.0 documentation states that calling this function

explicitly is no longer necessary except "in certain shared-library

situations"(?), get rid of it.

Submitted by: jchampion

Reviewed by: jchampion, ylavic, gsmith

  1. … 2 more files in changeset.
revert portion of r1790999 concerning ab.c

Retro win32 command-line build

allow building with OpenSSL 1.1.0

ab.c (abs)

----------

applink.c has been moved in this version of OpenSSL

dsw/dsp

-------

use srclib\apr\build\cvtdsp.pl -ossl11

from apr-1.6.x

  1. … 4 more files in changeset.
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

  1. … 15 more files in changeset.
Merge r1750854, r1750855, r1750947, r1750955, r1750960 from trunk:

ab: add SNI support when available.

ab: follow up to r1750854: put the -I at the right place for apr_getopt().

ab: follow up to r1750854.

Use SNI when available by default, and invert -I logic to now disable it.

ab: follow up to r1750854: some comments and better naming.

ab: follow up to r1750854: still better naming, and a C89 fix.

Submitted by: ylavic

Reviewed/backported by: jim

  1. … 3 more files in changeset.
Correct imbalanced #endif I introduced in r1748449
abs: Include OPENSSL_Applink when compiling on Windows, to resolve

failures under Visual Studio 2015 and other mismatched MSVCRT flavors.

PR: 59630

Submitted by: Jan Ehrhardt <phpdev ehrhardt.nl>

  1. … 3 more files in changeset.
Merge of r1733537 from trunk:

ab: caseless matching for http heaers

  1. … 1 more file in changeset.
merge r1703952 from trunk

Support compilation against libssl built with OPENSSL_NO_SSL3,

and change the compiled-in default for SSL[Proxy]Protocol to "all -SSLv3",

in accordance with RFC 7568. PR 58349, PR 57120.

Proposed by: kbrand

Reviewed by: ylavic, jorton

  1. … 8 more files in changeset.
Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

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

  1. … 16 more files in changeset.
Backport http://svn.apache.org/r1661913

ab: Add missing longest request (100%) to CSV export. PR57614.

Submitted by: ylavic

Reviewed by: covener, minfrin

  1. … 2 more files in changeset.
Merge r1622450 from trunk:

ab: increase request and response header size to 8192 bytes,

fix potential buffer-overflow in Server: header handling.

Submitted by: jkaluza

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1601076 from trunk:

ab: support custom HTTP method with -m argument.

PR: 56604

Submitted by: Roman Jurkov <winfinit gmail.com>

Reviewed by: ylavic, trawick, covener

(r1601680 and r1601700 not reflected in mergeinfo due to

a collision with an unrelated trunk change)

  1. … 3 more files in changeset.
Merge r1488492, r1542533, r1543020 from trunk:

Check if malloc succeeded

PR54344 [Bill Parker, wp02855 gmail com]

Check all memory allocations and abort on failure

follow-up to r1542533:

fix format string (unsigned vs. size_t)

Submitted by: jailletc36, sf, trawick

Reviewed/backported by: jim

  1. … 2 more files in changeset.
ab: Add wait time, fix processing time, and output write errors only if

they occured.

§rd patch of P45355.

Proposed by: jailletc36

Reviewed by: jim, rjung

Backport of r1488471 from turnk.

  1. … 3 more files in changeset.
Merge r1488644 from trunk:

Add a new -l parameter in order not to check the length of the responses. This can be usefull with dynamic pages.

PR9945, PR27888, PR42040

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 4 more files in changeset.
Merge r1451849 from trunk:

The 2 first patches from PR45355 have been ported

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
ab: Fix potential buffer overflows when processing the T and X

command-line options.

PR: 55360

Submitted by: Mike Rumph <mike.rumph oracle.com>

Reviewed by: trawick, jim, druggeri

  1. … 3 more files in changeset.
Merge r1422937 from trunk:

ab: add the possibility to define a socket timeout (-s timeout)

[Guido Serra <zeph fsfe org>]

Also some changes In usage():

- reword -t option to be more clear with the new -s

- add missing -q

- add the new -s option

- reword some options to better match online documentation

ab.xml claimed that -s was already there, but nothing in the code looks like that.

So, I guess it only landed on the online doc...

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 5 more files in changeset.