Checkout
 

tdonovan in httpd

The process_connection hook for mod_ftp must run before the process_connection

hook(s) for mod_http2 because http2 attempts a 24-byte speculative read. FTP

connections don't send headers, so mod_http2 hangs until this read times out.

http2's hook cannot be registered as a successor to ftp's because there are two mod_http2

process_connection hook functions. This change makes mod_ftp register as APR_HOOK_FIRST

and before mod_ssl & mod_reqtimeout to ensure that it runs before any other

protocol handlers.

Use the httpd-2.4 API function ap_get_conn_socket to set the socket timeout.

This has been wrong since 2.4, and the socket timeout hasn't been set correctly.

mod_ftp segfaults after httpd change r1839997 because setting the timeout

clobbers the filter context.

Set the useragent_addr and useragent_ip values from the connection

when creating a new request_rec. This enables use of the

Require ip authorization directive, which needs useragent_addr.

Backport r1449479 from trunk.

mod_include: Use new ap_expr for 'elif'. [PR 54548]

propose backport PR54548/r1449479 to 2.4 branch
bug 54548 - use new expr parser with 'elif', like 'if'
vote. autoconf option-checking warning fix

Tested with autoconf 2.59 (before problem) and 2.62 (after)

Always build odbc on Windows - backported from trunk to 2.2.x

trunk: r704771 & r704883

2.2.x: r712514

backport 704771 & 704883 from trunk

Windows: Always build the odbc dbd driver on windows,

to be consistent with the apr-util default.

DBD_LIST is still used to build additional dbd drivers.

windows .dsw file update for backport of r704771 (r704883)
Windows: add apr_dbd_odbc project to Visual Studio workspace .dsw file
Backport proposal: r704771
Always build the odbc dbd driver on winodws, to be consistent with the apr-util default

Merge r670061 (original fix), r670198 (correction), and r670254 (formatting) from trunk:

* mod_rewrite: Preserve the query string when [proxy,noescape]

PR 45247

Submitted by: tdonovan

Reviewed by: rpluem, niq, tdonovan

Merge r670061 (original fix), r670198 (correction), and r670254 (formatting) from trunk:

* mod_rewrite: Preserve the query string when [proxy,noescape]

PR 45247

Submitted by: tdonovan

Reviewed by: rpluem, niq, tdonovan

promote approved backport
remove proposal accidentally added twice
add proposal
correct the digest password Java example code - doc PR 45340, from trunk r674445
correct the digest password Java example code - doc PR 45340
Update mod_dbd page for ODBC driver
correct r670061 - preserve query string with [noescape, proxy]
backport proposal r670061 - indented correctly this time...
propose backport r670061
After r649840, mod_proxy_http will no longer append a query string from r->args if "no-canon".

Moved the NOESCAPE test down after PATH_INFO, and preserve the query string in r->filename if

NOESCAPE (which implies "no-canon")

Previously this was only done for CONNECT requests, where (r->uri == r->unparsed_uri)

see mod_proxy:proxy_detect

Windows manifests are embedded as ;1 for .exe's, ;2 for .dll's and .so's - ref: http://msdn.microsoft.com/en-us/library/ms235591.aspx
Windows manifests are ;1 for .exe, ;2 for .dll and .so - ref: http://msdn.microsoft.com/en-us/library/ms235591.aspx
fix Windows apr/ldap make - ARCH is only defined in apr, not in httpd
fix ldap make - ARCH is only defined in apr, not in httpd