httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_engine_io.c
Date Fri, 29 Aug 2003 14:45:26 GMT
jorton      2003/08/29 07:45:26

  Modified:    modules/ssl ssl_engine_io.c
  Log:
  * ssl_engine_io.c (ssl_io_filter_connect): Check the
  library code as well as the reason code when looking for the
  plain-HTTP-request error.
  
  Submitted by: Stephen Henson <steve@openssl.org>
  
  Revision  Changes    Path
  1.111     +2 -1      httpd-2.0/modules/ssl/ssl_engine_io.c
  
  Index: ssl_engine_io.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_io.c,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -u -r1.110 -r1.111
  --- ssl_engine_io.c	21 Jul 2003 12:02:39 -0000	1.110
  +++ ssl_engine_io.c	29 Aug 2003 14:45:26 -0000	1.111
  @@ -1091,7 +1091,8 @@
               outctx->rc = APR_EAGAIN;
               return SSL_ERROR_WANT_READ;
           }
  -        else if (ERR_GET_REASON(ERR_peek_error()) == SSL_R_HTTP_REQUEST) {
  +        else if (ERR_GET_LIB(ERR_peek_error()) == ERR_LIB_SSL &&
  +                 ERR_GET_REASON(ERR_peek_error()) == SSL_R_HTTP_REQUEST) {
               /*
                * The case where OpenSSL has recognized a HTTP request:
                * This means the client speaks plain HTTP on our HTTPS port.
  
  
  

Mime
View raw message