]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Backport from HEAD:
authorJoe Orton <jorton@apache.org>
Fri, 27 Aug 2004 09:03:24 +0000 (09:03 +0000)
committerJoe Orton <jorton@apache.org>
Fri, 27 Aug 2004 09:03:24 +0000 (09:03 +0000)
commit5a31292a03aede7d26c2d42e2e611404f3a21f78
tree3d88fa6e6a112bdefd31d6bb1fc8d36e62ef050b
parent2771bd0ec7da95ddd837abc6b4986ebba999a279
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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104851 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/mappers/mod_rewrite.c
modules/ssl/mod_ssl.h
modules/ssl/ssl_engine_io.c
modules/ssl/ssl_engine_vars.c
os/unix/unixd.c
server/util_script.c