www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

Fixed some win32 types.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040220 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Guenter Knauf
2010-11-29 18:33:28 +00:00
parent 0ec3771d37
commit dbf4a86e3d
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/arch/win32/mod_win32.c
View File

@@ -260,7 +260,7 @@ static apr_array_header_t *split_argv(apr_pool_t *p, const char *interp,
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(apr_pool_t *p, const char *interp,
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);
}

10
server/mpm/winnt/child.c
View File

@@ -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_connection(winnt_conn_ctx_t *context)
* 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 *handles, int *thread_cnt,
*/
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;

3
server/mpm/winnt/mpm_winnt.c
View File

@@ -616,7 +616,8 @@ static int create_process(apr_pool_t *p, HANDLE *child_proc, HANDLE *child_exit_
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.");