[patch] Patch to correct mpm-peruser on alpha

peruser-alphafix.patch (text/plain), 2.70 KB, created by Bert Smith on 2005-09-22 08:23:43 UTC

*** httpd-2.0.54/server/mpm/experimental/peruser/peruser.c.orig	Thu Sep 22 15:12:05 2005
--- httpd-2.0.54/server/mpm/experimental/peruser/peruser.c	Thu Sep 22 15:13:33 2005
***************
*** 1353,1360 ****
      apr_status_t rv;
      apr_bucket_alloc_t *bucket_alloc;
      int fd;
!     void* sock;
!     void* pod_sock;
  
      mpm_state = AP_MPMQ_STARTING; /* for benefit of any hooks that run as this
                                    * child initializes
--- 1353,1360 ----
      apr_status_t rv;
      apr_bucket_alloc_t *bucket_alloc;
      int fd;
!     apr_socket_t *sock = NULL;
!     apr_socket_t *pod_sock = NULL;
  
      mpm_state = AP_MPMQ_STARTING; /* for benefit of any hooks that run as this
                                    * child initializes
***************
*** 1409,1415 ****
              _DBG("%s %d", child_type_string(CHILD_INFO_TABLE[my_child_num].type), my_child_num);
  
              /* -- create new listener to receive from multiplexer -- */
!             apr_os_sock_put((void*)&sock, &CHILD_INFO_TABLE[my_child_num].senv->input, pconf);
              listen_clear();
              listen_add(pconf, sock, receive_from_multiplexer);
  
--- 1409,1415 ----
              _DBG("%s %d", child_type_string(CHILD_INFO_TABLE[my_child_num].type), my_child_num);
  
              /* -- create new listener to receive from multiplexer -- */
!             apr_os_sock_put(&sock, &CHILD_INFO_TABLE[my_child_num].senv->input, pconf);
              listen_clear();
              listen_add(pconf, sock, receive_from_multiplexer);
  
***************
*** 1422,1428 ****
      }
  
      apr_os_file_get(&fd, pipe_of_death_in);
!     apr_os_sock_put((void*)&pod_sock, &fd, pconf);
      listen_add(pconf, pod_sock, check_pipe_of_death);
  
      (peruser_setup_child(my_child_num) && clean_child_exit(APEXIT_CHILDFATAL));
--- 1422,1428 ----
      }
  
      apr_os_file_get(&fd, pipe_of_death_in);
!     apr_os_sock_put(&pod_sock, &fd, pconf);
      listen_add(pconf, pod_sock, check_pipe_of_death);
  
      (peruser_setup_child(my_child_num) && clean_child_exit(APEXIT_CHILDFATAL));
***************
*** 1525,1531 ****
  	/* if we accept() something we don't want to die, so we have to
  	 * defer the exit
  	 */
!         status = listensocks[offset].accept_func(&sock, &listensocks[offset], ptrans);
          SAFE_ACCEPT(accept_mutex_off()); 	/* unlock after "accept" */
  
          if (status == APR_EGENERAL) {
--- 1525,1531 ----
  	/* if we accept() something we don't want to die, so we have to
  	 * defer the exit
  	 */
!         status = listensocks[offset].accept_func((void *)&sock, &listensocks[offset], ptrans);
          SAFE_ACCEPT(accept_mutex_off()); 	/* unlock after "accept" */
  
          if (status == APR_EGENERAL) {