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

Changeset 1375113 is being indexed.

Merge r1356115, r1356813, r1086662 (tiny subset), and r1032431 from trunk:

mod_rewrite: Add "AllowAnyURI" option. PR 52774. [Joe Orton]

mod_rewrite: Fix the RewriteEngine directive to work within a

location. Previously, once RewriteEngine was switched on globally,

it was impossible to switch off. [Graham Leggett]

Reviewed by: rjung, wrowe, trawick

Only substitute slashes if needed.

Avoid error message from del since we print already an own.


mod_ssl: when compiled against OpenSSL 1.0.1 or later, allow explicit

control of TLSv1.1 and TLSv1.2 through the SSLProtocol directive,

adding TLSv1.1 and TLSv1.2 support by default given 'SSLProtocol All'.

Picked up comment edit, trusting openssl compilation state and current

method which openssl uses to include opensslconf.h - if this should be

refined, it needs to be refined for other openssl operations as well.

Any #define OPENSSL_* for httpd alone would be invalid, these are all

namespace protected by project.

Submitted by: kbrand, wrowe

Backports: 1222921, 1222930, 1225476, 1225792

Reviewed by: sf, kbrand, rjung

minor tweaks: fix server version banner, forget about old SSLMutex directive

Add default value of PrivilegesMode to docs.

Backport of r1375011 from trunk.

Clarify code comment.


Backport of r1375009 from trunk.

Fixed install.log output for SSL port.

Removed tabs and traling spaces.

Backport of r1375034 - no functional change.

Removed tabs and traling spaces.

use state query API instead of static counters to determine processing

phase in check_config and post_config hooks

Add default value of PrivilegesMode to docs.

Clarify code comment.

merge r1375006 from trunk:

describe some interesting differences from Unix MPMs

describe some interesting differences from Unix MPMs

Removed trailing semicolons from header also.

Move *_DECLARE_* macros to beginning of line in headers.

Patch submitted by: normw gknw net.

Removed trailing semicolons.

the rest of r1374877

minor cleanups

- don't duplicate prototype for child_main()

- make a few things static

minor cleanups

- don't duplicate prototype for child_main()

- make a few things static

correction to r1374780:

mpm_winnt.h now needs scoreboard.h for ap_generation_t

WinNT MPM: Fix thread-safety issue in worker_main(). All

workers were allocating from pchild without holding '

child_lock. Allocate from ptrans instead.

Related to: PR 52196

The reporter suggests that the apr_thread_t for r->connection->current_thread

should have a unique pool. This revision handles that for WinNT MPM,

but not for other MPMs.

fix typo in comment

Vote and correct comment.

WinNT MPM: Store pid and generation for each thread in scoreboard

to allow tracking of threads from exiting children via mod_status

or other such mechanisms.

Comment on TLSv1.1/.2 patch.

vote, comment