httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-test/flood flood_socket_keepalive.c flood_socket_generic.c
Date Tue, 04 Dec 2001 09:10:34 GMT
jerenkrantz    01/12/04 01:10:34

  Modified:    flood    flood_socket_keepalive.c flood_socket_generic.c
  Log:
  Oh, that's nice.  If we don't have SSL support built-in, they get a generic
  error message.  At least indicate that it isn't "implemented" - so, if we
  see this with open_socket call, we know what it is.  (And with the recent
  patch to print the URL, it'll be obvious when this happens.)
  
  Revision  Changes    Path
  1.9       +9 -2      httpd-test/flood/flood_socket_keepalive.c
  
  Index: flood_socket_keepalive.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/flood_socket_keepalive.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- flood_socket_keepalive.c	2001/10/03 01:33:00	1.8
  +++ flood_socket_keepalive.c	2001/12/04 09:10:34	1.9
  @@ -96,10 +96,17 @@
       keepalive_socket_t *ksock = (keepalive_socket_t *)sock;
   
       if (ksock->reopen_socket || ksock->s == NULL) {
  -        if (strcasecmp(req->parsed_uri->scheme, "https") == 0)
  +        if (strcasecmp(req->parsed_uri->scheme, "https") == 0) {
  +        /* If we don't have SSL, error out. */
  +#if FLOOD_HAS_OPENSSL
               ksock->ssl = 1;
  -        else
  +#else
  +        return APR_ENOTIMPL;
  +#endif
  +        }
  +        else {
               ksock->ssl = 0;
  +        }
   
           /* The return types are not identical, so it can't be a ternary
            * operation. */
  
  
  
  1.6       +9 -2      httpd-test/flood/flood_socket_generic.c
  
  Index: flood_socket_generic.c
  ===================================================================
  RCS file: /home/cvs/httpd-test/flood/flood_socket_generic.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- flood_socket_generic.c	2001/11/17 02:32:19	1.5
  +++ flood_socket_generic.c	2001/12/04 09:10:34	1.6
  @@ -85,10 +85,17 @@
   apr_status_t generic_begin_conn(socket_t *sock, request_t *req, apr_pool_t *pool)
   {
       generic_socket_t *gsock = (generic_socket_t *)sock;
  -    if (strcasecmp(req->parsed_uri->scheme, "https") == 0)
  +    if (strcasecmp(req->parsed_uri->scheme, "https") == 0) {
  +        /* If we don't have SSL, error out. */
  +#if FLOOD_HAS_OPENSSL
           gsock->ssl = 1;
  -    else
  +#else
  +        return APR_ENOTIMPL;
  +#endif
  +    }
  +    else {
           gsock->ssl = 0;
  +    }
   
       /* The return types are not identical, so it can't be a ternary
        * operation. */
  
  
  

Mime
View raw message