httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt child.c
Date Sun, 04 Aug 2002 18:47:34 GMT
wrowe       2002/08/04 11:47:34

  Modified:    server/mpm/winnt child.c
  Log:
    INVALID_SOCKET is -1 and appropriate to test throughout.
  
  Revision  Changes    Path
  1.5       +4 -4      httpd-2.0/server/mpm/winnt/child.c
  
  Index: child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/child.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- child.c	4 Aug 2002 18:44:52 -0000	1.4
  +++ child.c	4 Aug 2002 18:47:34 -0000	1.5
  @@ -306,7 +306,7 @@
   
       if (shutdown_in_progress && !allowed_globals.jobhead) {
           apr_thread_mutex_unlock(allowed_globals.jobmutex);
  -	return (-1);
  +	return (INVALID_SOCKET);
       }
       job = allowed_globals.jobhead;
       ap_assert(job);
  @@ -425,7 +425,7 @@
       while (1) {
           apr_pool_clear(context->ptrans);        
           context->accept_socket = remove_job();
  -        if (context->accept_socket == -1) {
  +        if (context->accept_socket == INVALID_SOCKET) {
               return NULL;
           }
   	len = sizeof(struct sockaddr);
  @@ -543,7 +543,7 @@
               while (1) {
                   rv = WaitForSingleObject(context->Overlapped.hEvent, 1000);
                   if (rv == WAIT_OBJECT_0) {
  -                    if (context->accept_socket == -1) {
  +                    if (context->accept_socket == INVALID_SOCKET) {
                           /* socket already closed */
                           break;
                       }
  @@ -963,7 +963,7 @@
       /* Shutdown the worker threads */
       if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
           for (i = 0; i < threads_created; i++) {
  -            add_job(-1);
  +            add_job(INVALID_SOCKET);
           }
       }
       else { /* Windows NT/2000 */
  
  
  

Mime
View raw message