httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1040220 - in /httpd/httpd/trunk: modules/arch/win32/mod_win32.c server/mpm/winnt/child.c server/mpm/winnt/mpm_winnt.c
Date Mon, 29 Nov 2010 18:33:28 GMT
Author: fuankg
Date: Mon Nov 29 18:33:28 2010
New Revision: 1040220

URL: http://svn.apache.org/viewvc?rev=1040220&view=rev
Log:
Fixed some win32 types.

Modified:
    httpd/httpd/trunk/modules/arch/win32/mod_win32.c
    httpd/httpd/trunk/server/mpm/winnt/child.c
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c

Modified: httpd/httpd/trunk/modules/arch/win32/mod_win32.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/arch/win32/mod_win32.c?rev=1040220&r1=1040219&r2=1040220&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/arch/win32/mod_win32.c (original)
+++ httpd/httpd/trunk/modules/arch/win32/mod_win32.c Mon Nov 29 18:33:28 2010
@@ -260,7 +260,7 @@ static apr_array_header_t *split_argv(ap
                     break;
                 }
                 ap_unescape_url(w);
-                prep_string(&w, p);
+                prep_string((const char**)&w, p);
                 arg = (const char**)apr_array_push(args);
                 *arg = ap_escape_shell_cmd(p, w);
             }
@@ -353,7 +353,7 @@ static apr_array_header_t *split_argv(ap
                 break;
             }
             ap_unescape_url(w);
-            prep_string(&w, p);
+            prep_string((const char**)&w, p);
             arg = (const char**)apr_array_push(args);
             *arg = ap_escape_shell_cmd(p, w);
         }

Modified: httpd/httpd/trunk/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?rev=1040220&r1=1040219&r2=1040220&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Mon Nov 29 18:33:28 2010
@@ -106,8 +106,8 @@ static apr_thread_mutex_t  *child_lock;
 static apr_thread_mutex_t  *qlock;
 static winnt_conn_ctx_t *qhead = NULL;
 static winnt_conn_ctx_t *qtail = NULL;
-static int num_completion_contexts = 0;
-static int max_num_completion_contexts = 0;
+static apr_uint32_t num_completion_contexts = 0;
+static apr_uint32_t max_num_completion_contexts = 0;
 static HANDLE ThreadDispatchIOCP = NULL;
 static HANDLE qwait_event = NULL;
 
@@ -716,7 +716,7 @@ static winnt_conn_ctx_t *winnt_get_conne
  * Main entry point for the worker threads. Worker threads block in
  * win*_get_connection() awaiting a connection to service.
  */
-static unsigned int __stdcall worker_main(void *thread_num_val)
+static DWORD __stdcall worker_main(void *thread_num_val)
 {
     static int requests_this_child = 0;
     winnt_conn_ctx_t *context = NULL;
@@ -851,7 +851,7 @@ static void cleanup_thread(HANDLE *handl
  */
 static void create_listener_thread()
 {
-    int tid;
+    unsigned tid;
     int num_listeners = 0;
     /* Start an accept thread per listener
      * XXX: Why would we have a NULL sd in our listeners?
@@ -896,7 +896,7 @@ void child_main(apr_pool_t *pconf)
     int watch_thread;
     int time_remains;
     int cld;
-    int tid;
+    DWORD tid;
     int rv;
     int i;
 

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=1040220&r1=1040219&r2=1040220&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Mon Nov 29 18:33:28 2010
@@ -616,7 +616,8 @@ static int create_process(apr_pool_t *p,
     env[envc] = pidbuf;
     env[envc + 1] = NULL;
 
-    rv = apr_proc_create(&new_child, cmd, args, env, attr, ptemp);
+    rv = apr_proc_create(&new_child, cmd, (const char * const *)args,
+                         (const char * const *)env, attr, ptemp);
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_CRIT, rv, ap_server_conf,
                      "Parent: Failed to create the child process.");



Mime
View raw message