Log Message: |
Backport from HEAD:
* os/unix/unixd.c (unixd_accept): Eliminate now-redundant call to
apr_os_sock_get(); let APR check for accept returning zero on TPF.
* modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix rollback
handling for AP_MODE_SPECULATIVE.
* modules/mappers/mod_rewrite.c (post_config): Retrieve optional
functions from mod_ssl. (lookup_variable): Support SSL:...
and HTTPS variables via mod_ssl optional hooks, if available.
* server/util_script.c (ap_scan_script_header_err_core): Set
Content-Range in r->headers_out, so that the byterange filter knows to
do nothing for a CGI script which produced a content-range.
* modules/ssl/mod_ssl.h: Declare ssl_is_https optional function.
* modules/ssl/ssl_engine_vars.c (ssl_is_https): New function.
(ssl_var_register): Register it.
PR: 30134, 30464
Reviewed by: trawick, jerenkrantz, nd, stoddard
|