httpd

Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1838483 is being indexed.

This is harmless, but cppcheck is right to warn about the spurious ')' position.

The only difference is the value of 'rv' after the test in case of error, but it is not used anymore, so we don't really care.

tweak ratelimit test to fail on 2.4.x

Backport r1786113 (Wording/formatting/typo fixes.)

+ s/require/Require/ to help syntax color highlight work correctly. (r1838458 + r1838459 in trunk)

s/require/Require/ to help another syntax color highlight work correctly.
s/require/Require/ to help syntax color highlight work correctly.
add a skeleton of a ratelimit test

    • ?
    /test/framework/trunk/t/modules/ratelimit.t
Rebuild.

XML updates.

Rebuild.

XML update.

Save some cycle.

There is no need to copy, strchr, strcmp and modify a string which is only used for TRACE2 logging.

Note that the code that looks similar a few lines below can not be optimized the same way because it is also returned in 'pmessage'.

- Add some links.

- Remove the space in "character set" in the syntax of ProxyFtpDirCharset to avoid confusion (it is 1 parameter only)

- Use the correct syntax for the "default" values, so that they are parsed and correctly displayed in 'quickreference'

- Remove extra [] when directive's parameter are required

- correct the default password: apache-proxy@ instead of apache_proxy@.

This was silently changed in r88745, 17 years ago!

(r1838313 in trunk + some style to synch 2.4.x and trunk)

- Add some links.

- Remove the space in "character set" in the syntax of ProxyFtpDirCharset to avoid confusion (it is 1 parameter only)

- Use the correct syntax for the "default" values, so that they are parsed and correctly displayed in 'quickreference'

- Remove extra [] when directive's parameter are required

- correct the default password: apache-proxy@ instead of apache_proxy@.

This was silently changed in r88745, 17 years ago!

Fix a cppcheck warning.

Remove some dead code. '!r->content_languages' is known to be true at this point.

Fix a cppcheck warning.

Remove some dead code. Updating 'last' is pointless here.

Fix a cppcheck warning.

'ap_unescape_urlencoded()' suggests that NULL can be passed to 'unescape_url()'.

So avoid a potential 'strchr(NULL, ...)' which is an undefined behavior.

uploading file to keep the ongoing changes

    • ?
    /httpd/trunk/docs/manual/howto/encrypt.xml.es
Merge r1418761, r1418765, r1510295, r1757147, r1805163, r1818924, r1827374, r1831772, r1832351, r1832951, r1815004 from trunk:

Don't claim "BIO dump follows" if it is not logged due to log level config.

make ssl_io_data_dump respect per-conn loglevel

add high trace level log messages for debugging buffering and write completion

* modules/ssl/ssl_engine_kernel.c (ssl_callback_SessionTicket): Fail

if RAND_bytes() fails; possible per API, although not in practice

with the OpenSSL implementation.

Fix typo in log message.

ap_add_common_vars(): use apr_pstrmemdup().

This avoids a transient replacement/restore of '?' by '\0' in r->filename.

Use 'ap_request_has_body()' instead of duplicating its implemenation.

The logic in 'ap_request_has_body()' is:

has_body = (!r->header_only

&& (r->kept_body

|| apr_table_get(r->headers_in, "Transfer-Encoding")

|| ( (cls = apr_table_get(r->headers_in, "Content-Length"))

&& (apr_strtoff(&cl, cls, &estr, 10) == APR_SUCCESS)

&& (!*estr)

&& (cl > 0) )

)

);

So the test is slighly different from the original code. (but this looks fine to me)

This also has the advantage to avoid a redundant call to 'apr_table_get()' and to improve readability.

While at it, move the test '!r->expecting_100' a few lines above because it is cheap.

PR62368: Print the unparsed URI in AH03454

... to include r->args and get otherwise get as close to possible to

what came in over the wire.

Submitted By: Hank Ibell <hwibell gmail.com>

Committed By: covener

All error handling paths of this function call 'apr_brigade_destroy()' , except this one.

So add it here too.

Probably spotted with the help of the Coccinelle software (Thx Julia for the patch and for Coccinelle)

See PR 53016

* modules/proxy/proxy_util.c (ap_proxy_share_worker): Skip creating subpool

for debugging unless debug-level logging is enabled. No functional change.

mod_watchdog: Correct some log messages and fix

compiler warning

"'rv' may be used uninitialized in this function".

Follow up to r1722154.

Submitted by: sf, jorton, jorton, ylavic, jailletc36, covener, jailletc36, jorton, rjung

Reviewed by: jailletc36, jim, jorton

Merge r1801143 from trunk:

mpm_winnt: Don't forget to close the I/O completion port as part of the

cleanup in the child process.

Submitted by: kotkov

Reviewed by: jailletc36, ylavic (by inspection), covener

add ids

minor bump from r1838055

add tests for host checking

    • ?
    /test/framework/trunk/t/apache/hostcheck.t
    • ?
    /test/framework/trunk/t/conf/core.conf.in
Add StrictHostCheck

.. to allow ucnonfigured hostnames to be rejected.

The checks happen during NVH mapping and checks that the

mapped VH itself has the host as a name or alias.

don't use workaround on trunk

it breaks the build w/ maintainer mode.

Merge r1797844 from trunk:

allow quoted paths in <IfFile>

The boilerplate code for config sections conflicts with TAKE1

because of the trailing stuff to terminate the opening tag.

Change from TAKE1 to RAW_ARGS and call ap_getword_conf()

directly.

Merge r1809135 from trunk:

On the trunk:

mpm_common.h: guarding AP_ENABLE_EXCEPTION_HOOK against use when undefined so that -Wundef does not triggger.

Vote+promote.

and promote those with 3 +1s

backport votes

Add missing details for CVE-2016-4975 which was mitigated by other changes