httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@zyzzyva.com>
Subject [PATCH] NT cleanup
Date Mon, 16 Jun 1997 14:38:21 GMT

I have the following changes against the current source tree. I'm 
headed into the proxy area now.


------- Forwarded Message

Index: mod_rewrite.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_rewrite.c,v
retrieving revision 1.29
diff -c -r1.29 mod_rewrite.c
*** mod_rewrite.c	1997/06/15 19:22:31	1.29
--- mod_rewrite.c	1997/06/16 14:37:37
***************
*** 2282,2292 ****
  /* Child process code for 'RewriteLog "|..."' */
  static int rewritelog_child(void *cmd)
  {
-     int child_pid = 0;
- 
      cleanup_for_exec();
      signal(SIGHUP, SIG_IGN);
  #if defined(WIN32)
      child_pid = spawnl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
      return(child_pid);
  #elif defined(__EMX__)
--- 2282,2291 ----
  /* Child process code for 'RewriteLog "|..."' */
  static int rewritelog_child(void *cmd)
  {
      cleanup_for_exec();
      signal(SIGHUP, SIG_IGN);
  #if defined(WIN32)
+     int child_pid = 0;
      child_pid = spawnl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
      return(child_pid);
  #elif defined(__EMX__)
***************
*** 2296,2302 ****
      execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
  #endif
      exit(1);
-     return(child_pid);
  }
  
  static void rewritelog(request_rec *r, int level, const char *text, ...)
--- 2295,2300 ----
***************
*** 2435,2445 ****
  /* child process code */
  static int rewritemap_program_child(void *cmd)
  {
-     int child_pid = 0;
-     
      cleanup_for_exec();
      signal(SIGHUP, SIG_IGN);
  #if defined(WIN32)
      child_pid = spawnl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
      return(child_pid);
  #elif defined(__EMX__)
--- 2433,2442 ----
  /* child process code */
  static int rewritemap_program_child(void *cmd)
  {
      cleanup_for_exec();
      signal(SIGHUP, SIG_IGN);
  #if defined(WIN32)
+     int child_pid = 0;
      child_pid = spawnl(SHELL_PATH, SHELL_PATH, "/c", (char *)cmd, NULL);
      return(child_pid);
  #elif defined(__EMX__)
***************
*** 2449,2455 ****
      execl(SHELL_PATH, SHELL_PATH, "-c", (char *)cmd, NULL);
  #endif
      exit(1);
-     return(0);
  }
  
  
--- 2446,2451 ----
Index: multithread.h
===================================================================
RCS file: /export/home/cvs/apache/src/multithread.h,v
retrieving revision 1.2
diff -c -r1.2 multithread.h
*** multithread.h	1997/06/15 22:27:12	1.2
--- multithread.h	1997/06/16 14:37:37
***************
*** 48,55 ****
  #define APACHE_TLS
  /* Only define the ones actually used, for now */
  #define create_mutex(name)	NULL
! #define acquire_mutex(mutex_id)	MULTI_OK
! #define release_mutex(mutex_id)	MULTI_OK
  
  
  #endif /* ndef MULTITHREAD */
--- 48,55 ----
  #define APACHE_TLS
  /* Only define the ones actually used, for now */
  #define create_mutex(name)	NULL
! #define acquire_mutex(mutex_id)	{}
! #define release_mutex(mutex_id) {}
  
  
  #endif /* ndef MULTITHREAD */

------- End of Forwarded Message




Mime
View raw message