httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/os/netware mod_tls.c
Date Thu, 08 Feb 2001 00:53:32 GMT
wrowe       01/02/07 16:53:30

  Modified:    src      CHANGES
               src/os/netware mod_tls.c
  Log:
    *) NetWare MOD_TLS fixes to disable nagles properly when making an SSL
       connection, and properly detect an SSL connection based on the port
       and work around the r->server->port 80 bug.
       [Brad Nicholes <BNICHOLES@novell.com>]
  
  Revision  Changes    Path
  1.1639    +5 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1638
  retrieving revision 1.1639
  diff -u -r1.1638 -r1.1639
  --- CHANGES	2001/02/07 23:43:44	1.1638
  +++ CHANGES	2001/02/08 00:53:10	1.1639
  @@ -1,5 +1,10 @@
   Changes with Apache 1.3.18
   
  +  *) NetWare MOD_TLS fixes to disable nagles properly when making an SSL
  +     connection, and properly detect an SSL connection based on the port
  +     and work around the r->server->port 80 bug.  
  +     [Brad Nicholes <BNICHOLES@novell.com>]
  +
     *) TPF startup/shutdown fixes. [David McCreedy <McCreedy@us.ibm.com>]
   
     *) Correct a typo in httpd.conf.
  
  
  
  1.5       +17 -8     apache-1.3/src/os/netware/mod_tls.c
  
  Index: mod_tls.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/netware/mod_tls.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_tls.c	2001/01/15 17:06:16	1.4
  +++ mod_tls.c	2001/02/08 00:53:23	1.5
  @@ -207,12 +207,6 @@
           return -1;
       }
   
  -    if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &no, sizeof(int)) < 0)
{
  -        errno = WSAGetLastError();
  -        ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf,
  -            "setsockopt: (TCP_NODELAY)");
  -    }
  -
       if (server_conf->send_buffer_size) {
           if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
               (char *) &server_conf->send_buffer_size, sizeof(int)) < 0) {
  @@ -233,6 +227,12 @@
           return -1;
       }
   
  +    if (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char *) &no, sizeof(int)) < 0)
{
  +        errno = WSAGetLastError();
  +        ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf,
  +            "setsockopt: (TCP_NODELAY)");
  +    }
  +
       if (listen(s, ap_listenbacklog) == -1) {
           errno = WSAGetLastError();
           ap_log_error(APLOG_MARK, APLOG_ERR, server_conf,
  @@ -348,8 +348,13 @@
       table *e = r->subprocess_env;    
       const char *s_secure;
       char port[8];
  +    
       
  -    itoa(r->server->port, port, 10);
  +    // For some reason r->server->port always return 80 rather than
  +    //  the current port.  So for now we will get it straight from
  +    //  the horses mouth.
  +    //  itoa(r->server->port, port, 10);
  +    itoa(ntohs(((r->connection)->local_addr).sin_port), port, 10);
       s_secure = ap_table_get(sc->sltable, port);    
       
       if (!s_secure)
  @@ -381,8 +386,12 @@
       NULL,                     /* check auth */
       NULL,                     /* check access */
       NULL,                     /* type_checker */    
  -    tls_hook_Fixup,           /* fixups */
  +    NULL,			          /* fixups */
       NULL,                     /* logger */
  +    NULL,               	  /* header parser */
  +    NULL,               	  /* child_init */
  +    NULL,			       	  /* child_exit */
  +    tls_hook_Fixup         	  /* post read request */
   };
   
   
  
  
  

Mime
View raw message