Changeset 874

Show
Ignore:
Timestamp:
08/01/07 14:49:53 (1 year ago)
Author:
adefacc
Message:

fix cherokee_connection_set_cork()

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • cherokee/trunk/ChangeLog

    r873 r874  
     12007-08-01  A.D.F  <adefacc@tin.it> 
     2 
     3        * cherokee/connection.c 
     4          - cherokee_connection_set_cork(), set or unset conn->options 
     5            cork bit properly; 
     6 
     7        * cherokee/handler_file.c 
     8          - pass true not 1 to "enable" parameter of 
     9            cherokee_connection_set_cork(), 
     10            because that formal parameter is a boolean type 
     11            (only a formal issue, no change in practice). 
     12 
    1132007-07-31  Alvaro Lopez Ortega  <alvaro@alobbs.com> 
    214 

  • cherokee/trunk/cherokee/connection.c

    r857 r874  
    742742                on = 1; 
    743743                setsockopt(fd, IPPROTO_TCP, TCP_CORK,  &on, sizeof on); 
     744                BIT_SET (conn->options, conn_op_tcp_cork); 
    744745        } else { 
    745746                setsockopt(fd, IPPROTO_TCP, TCP_CORK,  &on, sizeof on); 
    …… 
    747748                on = 1; 
    748749                setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,  &on, sizeof on); 
    749         } 
    750  
    751         BIT_SET (conn->options, conn_op_tcp_cork); 
     750                BIT_UNSET (conn->options, conn_op_tcp_cork); 
     751        } 
    752752#endif 
    753753 

  • cherokee/trunk/cherokee/handler_file.c

    r869 r874  
    522522 
    523523        if (fhdl->using_sendfile) { 
    524                 cherokee_connection_set_cork (conn, 1); 
     524                cherokee_connection_set_cork (conn, true); 
    525525        } 
    526526#endif 

  • cherokee/trunk/cherokee/socket.c

    r846 r874  
    654654                } 
    655655                /* NOTREACHED */ 
    656         }               
     656        } 
    657657 
    658658        /* Disable Nagle's algorithm for this connection