Commit df547a08 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1719967 from trunk: 

mod_ssl: fix build with openssl < 0.9.8m (missing semicolon).
Reported by: Petr Gajdos <pgajdos suse.cz>
Submitted by: ylavic
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1722179 13f79535-47bb-0310-9956-ffa450edef68
parent 3c58ba77

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -112,11 +112,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_ssl: Fix missing semicolon for building with OpenSSL < 0.9.8m.

     trunk patch: http://svn.apache.org/r1719967

     +1: ylavic, mrumph, wrowe

     mrumph: Bug 58737 was also opened for this error.



  *) Remove some useless return statements (+ some minor style changes)

     trunk patch: http://svn.apache.org/r1715567

                  http://svn.apache.org/r1715568

modules/ssl/ssl_engine_io.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static int bio_filter_out_write(BIO *bio, const char *in, int inl) 
     * so limit the performance impact to handshake time.

     */

#if OPENSSL_VERSION_NUMBER < 0x0009080df

     need_flush = !SSL_is_init_finished(outctx->filter_ctx->pssl)

     need_flush = !SSL_is_init_finished(outctx->filter_ctx->pssl);

#else

     need_flush = SSL_in_connect_init(outctx->filter_ctx->pssl);

#endif