/[Apache-SVN]
ViewVC logotype

Revision 1651077


Jump to revision: Previous Next
Author: jim
Date: Mon Jan 12 13:31:16 2015 UTC (9 years, 3 months ago)
Changed paths: 8
Log Message:
Merge r1601184, r1601274, r1601185 from trunk:

mod_ssl: Ensure that the SSL close notify alert is flushed to the client.
         PR54998.

Submitted By: Tim Kosse <tim.kosse filezilla-project.org>, ylavic
Committed By: ylavic


mod_ssl: SSL_smart_shutdown(): follow up to r1601184.
Use SSL_get_wbio() to comply with OPENSSL_NO_SSL_INTERN.
Stop SSL shutdown loop when flush fails.


mpm_event[opt]: Send the SSL close notify alert when the KeepAliveTimeout
                expires. PR54998.

Submitted by: ylavic
Reviewed/backported by: jim


Changed paths

Path Details
Directoryhttpd/httpd/branches/2.4.x/ modified , props changed
Directoryhttpd/httpd/branches/2.4.x/CHANGES modified , text changed
Directoryhttpd/httpd/branches/2.4.x/docs/manual/rewrite/advanced.xml modified , props changed
Directoryhttpd/httpd/branches/2.4.x/include/ap_mmn.h modified , text changed
Directoryhttpd/httpd/branches/2.4.x/include/http_connection.h modified , text changed
Directoryhttpd/httpd/branches/2.4.x/modules/ssl/ssl_util_ssl.c modified , text changed
Directoryhttpd/httpd/branches/2.4.x/server/connection.c modified , text changed
Directoryhttpd/httpd/branches/2.4.x/server/mpm/event/event.c modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26