httpd

Checkout Tools
  • last updated 2 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1800618 is being indexed.

Merge r1800306, r1800393 from trunk:

proxy_fcgi: remove FPM-specific logic

Reverts r1780328, r1780329, and their associated followups, which

incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t

regression tests now pass.

PR: 61202

Partial reversal of r1800306... note virtual scripts in notes

Submitted by: jchampion, jim

Reviewed by: jchampion, jim, covener

* Do not apply the strict permissions of the temporary file to a possibly

existing passwd file.

This long standing bug was triggered by fixing a bug in APR in r1791029.

PR: 61240

vote/promote fcgi

Rebuild.

XML update.

vote on fcgi backport

Check that if PATH_INFO is undef/empty, PATH_TRANSLATED is undef

better debug info: Handler cases

comment on the kills and make daemon mode for fpm explicit

(it IS the default, but make sure anyway)

PR61202: add virtual_script note back to backport (un-revert)

Per ML discussion; thanks to Jim for pointing this out.

Check FCGI_ROLE while we are at it.

Add in a simple ProxyPass test... Again, these

are the expected values as determined by the

reading of the RFCs and examples given by the

various PRs

  1. /test/framework/trunk/t/htdocs/php/fpm/pp/sub1
  2. /test/framework/trunk/t/htdocs/php/fpm/pp
As per my reading of RFC3875, this is what PATH_TRANSLATED

should be... also checked via PR51517 which also seems

to indicate that.

Ensure we are testing via FPM BackendType w/ the actual

php-fpm tests

Prep for additional tests.

o Put all php-fpm tests under htdocs/php/fpm

o All Action-based tests will be under htdocs/php/fpm/action

o Allows for addition tests, like ProxyPass, GENERIC vs PHP-FPM, etc

under a singular dir structure

  1. /test/framework/trunk/t/htdocs/php/fpm/action/sub2
  2. /test/framework/trunk/t/htdocs/php/fpm/action
    • ?
    /test/framework/trunk/t/htdocs/php/fpm/test.php
This test uses/requires mod_action, so fold that in, and

also test that PATH_INFO and QUERY_STRING are set correctly

Partial reversal of r1800306... note virtual scripts in notes

Propose showstopper.
proxy_fcgi: remove FPM-specific logic

Reverts r1780328, r1780329, and their associated followups, which

incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t

regression tests now pass.

PR: 61202

Fix 2.4.7 tests count
The HTTP_PORT has been correct for some time now on 2.2 and 2.4.

Mop up four 'unexpected TODO... ok' results

Merge r1551611, r1783765, r1788996, r1788998, r1789000, r1795651 from trunk:

Log a warning when the LDAP authn provider is configured but an AuthLDAPURL

isn't -- IOW, avoid silently skipping a misconfigured [or buggy?] LDAP provider.

Follow up to r1772919: update APLOGNO().

Save a few cycles.

'apr_pstrcatv' can compute the length of the new string for us.

Improve indentation

Group bit field values in order to save some memory.

Add an explicit NULL to initialise a field in an authn_provider structure, as done in all other places. PR 60636

Submitted by: covener, ylavic, jailletc36, jailletc36, jailletc36, jailletc36

Reviewed by: jailletc36, jim, ylavic

Merge r1735906 from trunk:

Avoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_location_walk'

Submitted by: jailletc36

Reviewed by: jailletc36, jim, ylavic

Restore single-char field names inadvertantly disallowed in 2.4.25.

Backports: r1800173

PR: 61220

Submitted by: ylavic

Reviewed by: wrowe, jchampion, ylavic

Restore single-char field names inadvertantly disallowed in 2.4.25.

Backports: r1800173

PR: 61220

Submitted by: ylavic

Reviewed by: wrowe, jchampion, ylavic

Vote, promote.
Vote, promote.
Vote, promote.
Actually this was a vote for 1800111, not the revised patch
Vote, promote.

Added 2.2.x convenience patch.