Commit ac126031 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

*) mod_ssl: Fix mod_authz provider for "require ssl" directive to check correctly 

     on HTTP/2 connections. Fixes PR 62654. [Stefan Eissing]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1846111 13f79535-47bb-0310-9956-ffa450edef68
parent eccbb353

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.1



  *) mod_ssl: Fix mod_authz provider for "require ssl" directive to check correctly

     on HTTP/2 connections. Fixes PR 62654. [Stefan Eissing]



  *) mod_ssl: clear *SSL errors before loading certificates and checking

     afterwards. Otherwise errors are reported when other SSL using modules

     are in play. Fixes PR 62880. [Michael Kaufmann]

modules/ssl/ssl_engine_kernel.c

+1 −4
Changes for modules/ssl/ssl_engine_kernel.c: 1 added line, 4 removed lines.
Original line number Diff line number Diff line
@@ -1605,10 +1605,7 @@ static authz_status ssl_authz_require_ssl_check(request_rec *r, 
                                                const char *require_line,

                                                const void *parsed)

{

    SSLConnRec *sslconn = myConnConfig(r->connection);

    SSL *ssl = sslconn ? sslconn->ssl : NULL;



    if (ssl)

    if (modssl_request_is_tls(r, NULL))

        return AUTHZ_GRANTED;

    else

        return AUTHZ_DENIED;