Changeset 731

Show
Ignore:
Timestamp:
02/29/08 20:01:44 (6 months ago)
Author:
dsallings
Message:

Merge commit 'trunk' into lbinary r729 (server_socket refactoring)

Conflicts:

server/memcached.c

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/binary/server/memcached.c

    r730 r731  
    29862986} 
    29872987 
    2988  
    29892988static int server_socket(const int port, const int prot) { 
    29902989    int sfd; 
    …… 
    30773076            exit(EXIT_FAILURE); 
    30783077        } 
    3079  
    3080         if (listen_conn == NULL) { 
    3081             listen_conn = listen_conn_add; 
    3082         } else { 
    3083             listen_conn_add->next = listen_conn->next; 
    3084             listen_conn->next = listen_conn_add; 
    3085         } 
     3078        listen_conn_add->next = listen_conn; 
     3079        listen_conn = listen_conn_add; 
    30863080      } 
    30873081    } 
    …… 
    30893083    freeaddrinfo(ai); 
    30903084 
    3091     if (success == 0) 
    3092         return 1; 
    3093  
    3094     return 0; 
     3085    /* Return zero iff we detected no errors in starting up connections */ 
     3086    return success == 0; 
    30953087} 
    30963088