diff options
| author | Jeff Trawick <trawick@apache.org> | 2015-10-03 22:46:55 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2015-10-03 22:46:55 +0000 |
| commit | 10546d8ed11cb7a7f5d24ed27f188a045fd36807 (patch) | |
| tree | a0405b9820f941b8c57ada36b8cfe3835e506c55 /os | |
| parent | f94ab6e5a491a20a3d0ed1b9061a6703b3e70178 (diff) | |
| download | httpd-10546d8ed11cb7a7f5d24ed27f188a045fd36807.tar.gz | |
Merge r1706627, r1706640 from trunk:
Support mod_http2 in cmake-based build for Windows.
Leave LoadModule of mod_http2 commented-out by default.
Merge r1706635 from trunk:
mod_http2 larger with 64-bit VS 2012 RelWithDebInfo build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1706644 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os')
| -rw-r--r-- | os/win32/BaseAddr.ref | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index ca16be894d..c7a98e008b 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -127,4 +127,4 @@ mod_optional_fn_import.so 0x70BC0000 0x00010000 mod_optional_hook_export.so 0x70BD0000 0x00010000 mod_optional_hook_import.so 0x70BE0000 0x00010000 mod_authnz_fcgi.so 0x70BF0000 0x00020000 -mod_http2.so 0x70C10000 0x00020000 +mod_http2.so 0x70C10000 0x00030000 |