httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/main http_log.c
Date Mon, 11 Oct 1999 17:52:30 GMT
rbb         99/10/11 10:52:29

  Modified:    src/lib/apr/include apr_portable.h apr_thread_proc.h
               src/lib/apr/locks/unix locks.c
               src/lib/apr/test testproc.c testsig.c testsock.c
                        testthread.c
               src/lib/apr/threadproc/beos proc.c procsup.c thread.c
                        threadcancel.c threadpriv.c
               src/lib/apr/threadproc/os2 proc.c thread.c threadcancel.c
                        threadpriv.c
               src/lib/apr/threadproc/unix proc.c procsup.c thread.c
                        threadcancel.c threadpriv.c
               src/lib/apr/threadproc/win32 proc.c thread.c threadcancel.c
                        threadpriv.c
               src/lib/apr/time/unix time.c
               src/main http_log.c
  Log:
  This finishes the argument swaps.  The docs haven't been updated, and
  probably won't be for a while yet.  These argument orders have been
  documented in the APR Design doc committed earlier today.
  
  Revision  Changes    Path
  1.8       +4 -4      apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_portable.h	1999/10/10 20:34:54	1.7
  +++ apr_portable.h	1999/10/11 17:51:47	1.8
  @@ -183,11 +183,11 @@
   ap_status_t ap_get_os_file(ap_os_file_t *, ap_file_t *);     
   ap_status_t ap_get_os_dir(ap_os_dir_t *, ap_dir_t *);      
   ap_status_t ap_get_os_sock(ap_os_sock_t *, ap_socket_t *);
  -ap_status_t ap_get_os_lock(ap_lock_t *, ap_os_lock_t *);     
  -ap_status_t ap_get_os_thread(ap_thread_t *, ap_os_thread_t *);
  -ap_status_t ap_get_os_proc(ap_proc_t *, ap_os_proc_t *);     
  +ap_status_t ap_get_os_lock(ap_os_lock_t *, ap_lock_t *);     
  +ap_status_t ap_get_os_thread(ap_os_thread_t *, ap_thread_t *);
  +ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *);     
   ap_status_t ap_get_os_time(ap_os_time_t **, ap_time_t *);     
  -ap_status_t ap_get_os_threadkey(ap_key_t *, ap_os_threadkey_t *);
  +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *, ap_key_t *);
   
   ap_status_t ap_put_os_file(ap_file_t **, ap_os_file_t *, ap_context_t *); 
   ap_status_t ap_put_os_dir(ap_dir_t **, ap_os_dir_t *, ap_context_t *); 
  
  
  
  1.8       +19 -19    apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_thread_proc.h	1999/10/11 14:20:39	1.7
  +++ apr_thread_proc.h	1999/10/11 17:51:48	1.8
  @@ -86,27 +86,27 @@
   ap_status_t ap_create_threadattr(ap_threadattr_t **, ap_context_t *);
   ap_status_t ap_setthreadattr_detach(ap_threadattr_t *, ap_int32_t);
   ap_status_t ap_getthreadattr_detach(ap_threadattr_t *);
  -ap_status_t ap_create_thread(ap_context_t *, ap_threadattr_t *, 
  -                             ap_thread_start_t, void *, ap_thread_t **);
  +ap_status_t ap_create_thread(ap_thread_t **, ap_threadattr_t *, 
  +                             ap_thread_start_t, void *, ap_context_t *);
   ap_status_t ap_thread_exit(ap_thread_t *, ap_status_t *);
  -ap_status_t ap_thread_join(ap_thread_t *thd, ap_status_t *); 
  +ap_status_t ap_thread_join(ap_status_t *, ap_thread_t *thd); 
   ap_status_t ap_thread_detach(ap_thread_t *);
   
   ap_status_t ap_cancel_thread(ap_thread_t *);
  -ap_status_t ap_setcanceltype(ap_context_t *, ap_int32_t);
  -ap_status_t ap_setcancelstate(ap_context_t *, ap_int32_t);
  -ap_status_t ap_get_threaddata(ap_thread_t *, char *, void *);
  -ap_status_t ap_set_threaddata(ap_thread_t *, void *, char *,
  -                              ap_status_t (*cleanup) (void *));
  +ap_status_t ap_setcanceltype(ap_int32_t, ap_context_t *);
  +ap_status_t ap_setcancelstate(ap_int32_t, ap_context_t *);
  +ap_status_t ap_get_threaddata(void *, char *, ap_thread_t *);
  +ap_status_t ap_set_threaddata(void *, char *,
  +                              ap_status_t (*cleanup) (void *), ap_thread_t *);
   
  -ap_status_t ap_create_thread_private(ap_context_t *, void (*dest)(void *), 
  -                                     ap_key_t **);
  +ap_status_t ap_create_thread_private(ap_key_t **, void (*dest)(void *), 
  +                                     ap_context_t *);
   ap_status_t ap_get_thread_private(void **, ap_key_t *);
  -ap_status_t ap_set_thread_private(ap_key_t *, void *);
  +ap_status_t ap_set_thread_private(void *, ap_key_t *);
   ap_status_t ap_delete_thread_private(ap_key_t *);
  -ap_status_t ap_get_threadkeydata(ap_key_t *, char *, void *);
  -ap_status_t ap_set_threadkeydata(ap_key_t *, void *, char *,
  -                                 ap_status_t (*cleanup) (void *));
  +ap_status_t ap_get_threadkeydata(void *, char *, ap_key_t *);
  +ap_status_t ap_set_threadkeydata(void *, char *,
  +                                 ap_status_t (*cleanup) (void *), ap_key_t *);
   
   /* Process Function definitions */
   ap_status_t ap_createprocattr_init(ap_procattr_t **, ap_context_t *);
  @@ -121,17 +121,17 @@
   ap_status_t ap_setprocattr_dir(ap_procattr_t *, const char *);
   ap_status_t ap_setprocattr_cmdtype(ap_procattr_t *, ap_cmdtype_e);
   ap_status_t ap_setprocattr_detach(ap_procattr_t *, ap_int32_t);
  -ap_status_t ap_get_procdata(ap_proc_t *, char *, void *);
  -ap_status_t ap_set_procdata(ap_proc_t *, void *, char *,
  -                            ap_status_t (*cleanup) (void *));
  +ap_status_t ap_get_procdata(char *, void *, ap_proc_t *);
  +ap_status_t ap_set_procdata(void *, char *,
  +                            ap_status_t (*cleanup) (void *), ap_proc_t *);
   
   ap_status_t ap_get_childin(ap_file_t **, ap_proc_t *);
   ap_status_t ap_get_childout(ap_file_t **, ap_proc_t *);
   ap_status_t ap_get_childerr(ap_file_t **, ap_proc_t *);
   
   ap_status_t ap_fork(ap_proc_t **, ap_context_t *);
  -ap_status_t ap_create_process(ap_proc_t **, ap_context_t *, const char *, 
  -                              char *const [], char **, ap_procattr_t *);
  +ap_status_t ap_create_process(ap_proc_t **, const char *, char *const [], 
  +                              char **, ap_procattr_t *, ap_context_t *);
   ap_status_t ap_wait_proc(ap_proc_t *, ap_wait_how_e);
   
   ap_status_t ap_kill(ap_proc_t *, ap_int32_t);
  
  
  
  1.8       +2 -2      apache-2.0/src/lib/apr/locks/unix/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- locks.c	1999/10/08 20:03:50	1.7
  +++ locks.c	1999/10/11 17:51:51	1.8
  @@ -234,12 +234,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_lock(ap_lock_t **, ap_os_lock_t *)
  + * ap_status_t ap_get_os_lock(ap_os_lock_t *, ap_lock_t **)
    *    onvert the lock from os specific type to apr type
    * arg 1) The apr lock to convert.
    * arg 2) The os specific lock we are converting to.
    */
  -ap_status_t ap_get_os_lock(struct lock_t *lock, ap_os_lock_t *oslock)
  +ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, struct lock_t *lock)
   {
       if (lock == NULL) {
           return APR_ENOLOCK;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/test/testproc.c
  
  Index: testproc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testproc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testproc.c	1999/10/06 23:04:07	1.4
  +++ testproc.c	1999/10/11 17:52:01	1.5
  @@ -128,7 +128,7 @@
       args[2] = NULL;
       
       fprintf(stdout, "Creating a new process.......");
  -    if (ap_create_process(context, "../testproc", args, NULL, attr, &newproc) != APR_SUCCESS)
{
  +    if (ap_create_process(&newproc, "../testproc", args, NULL, attr, context) != APR_SUCCESS)
{
           fprintf(stderr, "Could not create the new process\n");
           exit(-1);
       }
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/test/testsig.c
  
  Index: testsig.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsig.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- testsig.c	1999/10/11 01:39:24	1.4
  +++ testsig.c	1999/10/11 17:52:01	1.5
  @@ -111,7 +111,7 @@
       args[1] = ap_pstrdup(context, "-X");
       args[2] = NULL;
       
  -    if (ap_create_process(context, "./testsig", args, NULL, attr, &newproc) != APR_SUCCESS)
{
  +    if (ap_create_process(&newproc, "./testsig", args, NULL, attr, context) != APR_SUCCESS)
{
           fprintf(stderr, "Could not create the new process\n");
           exit(-1);
       }
  
  
  
  1.4       +2 -2      apache-2.0/src/lib/apr/test/testsock.c
  
  Index: testsock.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testsock.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- testsock.c	1999/10/04 16:37:25	1.3
  +++ testsock.c	1999/10/11 17:52:02	1.4
  @@ -97,10 +97,10 @@
   
       args[0] = ap_pstrdup(context, "server");
       args[1] = NULL; 
  -    s1 = ap_create_process(context, "./server", args, NULL, attr1, &proc1);
  +    s1 = ap_create_process(&proc1, "./server", args, NULL, attr1, context);
   
       args[0] = ap_pstrdup(context, "client");
  -    s2 = ap_create_process(context, "./client", args, NULL, attr2, &proc2);
  +    s2 = ap_create_process(&proc2, "./client", args, NULL, attr2, context);
   
       if (s1 != APR_SUCCESS || s2 != APR_SUCCESS) {
           fprintf(stderr, "Problem spawning new process\n");
  
  
  
  1.6       +8 -8      apache-2.0/src/lib/apr/test/testthread.c
  
  Index: testthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/test/testthread.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testthread.c	1999/10/08 20:04:30	1.5
  +++ testthread.c	1999/10/11 17:52:02	1.6
  @@ -144,10 +144,10 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Starting all the threads......."); 
  -    s1 = ap_create_thread(context, NULL, thread_func1, NULL, &t1);
  -    s2 = ap_create_thread(context, NULL, thread_func2, NULL, &t2);
  -    s3 = ap_create_thread(context, NULL, thread_func3, NULL, &t3);
  -    s4 = ap_create_thread(context, NULL, thread_func4, NULL, &t4);
  +    s1 = ap_create_thread(&t1, NULL, thread_func1, NULL, context);
  +    s2 = ap_create_thread(&t2, NULL, thread_func2, NULL, context);
  +    s3 = ap_create_thread(&t3, NULL, thread_func3, NULL, context);
  +    s4 = ap_create_thread(&t4, NULL, thread_func4, NULL, context);
       if (s1 != APR_SUCCESS || s2 != APR_SUCCESS || 
           s3 != APR_SUCCESS || s4 != APR_SUCCESS) {
           fprintf(stderr, "Error starting thread\n");
  @@ -156,10 +156,10 @@
       fprintf(stdout, "OK\n");
   
       fprintf(stdout, "Waiting for threads to exit.......");
  -    ap_thread_join(t1, &s1);
  -    ap_thread_join(t2, &s2);
  -    ap_thread_join(t3, &s3);
  -    ap_thread_join(t4, &s4);
  +    ap_thread_join(&s1, t1);
  +    ap_thread_join(&s2, t2);
  +    ap_thread_join(&s3, t3);
  +    ap_thread_join(&s4, t4);
       fprintf (stdout, "OK\n");   
   
       fprintf(stdout, "Checking if locks worked......."); 
  
  
  
  1.6       +3 -3      apache-2.0/src/lib/apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- proc.c	1999/10/08 16:19:25	1.5
  +++ proc.c	1999/10/11 17:52:05	1.6
  @@ -166,9 +166,9 @@
   }
   
   
  -ap_status_t ap_create_process(ap_context_t *cont, char *progname, 
  -                               char *const args[], char **env, 
  -                               struct procattr_t *attr, struct proc_t **new)
  +ap_status_t ap_create_process(struct proc_t **new, char *progname, 
  +                              char *const args[], char **env, 
  +                              struct procattr_t *attr, ap_context_t *cont)
   {
       int i=0,nargs=0;
       char **newargs = NULL;
  
  
  
  1.5       +4 -3      apache-2.0/src/lib/apr/threadproc/beos/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- procsup.c	1999/10/08 20:04:32	1.4
  +++ procsup.c	1999/10/11 17:52:06	1.5
  @@ -97,7 +97,7 @@
       }
   }
   
  -ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data)
  +ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
   {
       if (proc != NULL) {
           return ap_get_userdata(&data, key, proc->cntxt);
  @@ -108,8 +108,9 @@
       }
   }
   
  -ap_status_t ap_set_procdata(struct proc_t *proc, void *data, char *key, 
  -                            ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_procdata(void *data, char *key, 
  +                            ap_status_t (*cleanup) (void *), 
  +                            struct proc_t *proc)
   {
       if (proc != NULL) {
           return ap_set_userdata(data, key, cleanup, proc->cntxt);
  
  
  
  1.4       +4 -4      apache-2.0/src/lib/apr/threadproc/beos/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/thread.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- thread.c	1999/10/04 16:37:31	1.3
  +++ thread.c	1999/10/11 17:52:06	1.4
  @@ -95,9 +95,9 @@
   	return APR_NOTDETACH;
   }
   
  -ap_status_t ap_create_thread(ap_context_t *cont, struct threadattr_t *attr,
  -                                ap_thread_start_t func, void *data,
  -                                struct thread_t **new)
  +ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr,
  +                             ap_thread_start_t func, void *data,
  +                             ap_context_t *cont)
   {
       int32 temp;
       ap_status_t stat;
  @@ -141,7 +141,7 @@
   	exit_thread ((status_t)retval);
   }
   
  -ap_status_t ap_thread_join(ap_thread_t *thd, ap_status_t *retval)
  +ap_status_t ap_thread_join(ap_status_t *retval, ap_thread_t *thd)
   {
       if (wait_for_thread(thd->td,(void *)&retval) == B_NO_ERROR) {
           return APR_SUCCESS;
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/threadproc/beos/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadcancel.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadcancel.c	1999/08/17 15:59:49	1.1
  +++ threadcancel.c	1999/10/11 17:52:06	1.2
  @@ -69,7 +69,7 @@
   }
   
       
  -ap_status_t ap_setcanceltype(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcanceltype(ap_int32_t type, ap_context_t *cont)
   {
   /*    if (pthread_setcanceltype(type, NULL) == 0) {*/
           return APR_SUCCESS;
  @@ -79,7 +79,7 @@
       }*/
   }
   
  -ap_status_t ap_setcancelstate(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont)
   {
   /*    if (pthread_setcanceltype(type, NULL) == 0) {*/
           return APR_SUCCESS;
  
  
  
  1.3       +3 -3      apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadpriv.c	1999/10/04 16:37:31	1.2
  +++ threadpriv.c	1999/10/11 17:52:07	1.3
  @@ -62,8 +62,8 @@
   static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS];
   static sem_id lock;
   
  -ap_status_t ap_create_thread_private(ap_context_t *cont,
  -                                void (*dest)(void *), struct threadkey_t **key)
  +ap_status_t ap_create_thread_private(struct threadkey_t **key,
  +                                void (*dest)(void *), ap_context_t *cont)
   {
       (*key) = (struct threadkey_t *)ap_palloc(cont, sizeof(struct threadkey_t));
       if ((*key) == NULL) {
  @@ -118,7 +118,7 @@
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_thread_private(struct threadkey_t *key, void *priv)
  +ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
   {
   	thread_id tid;
   	int i,index = 0, ret;
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/threadproc/os2/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- proc.c	1999/10/11 14:44:24	1.4
  +++ proc.c	1999/10/11 17:52:12	1.5
  @@ -159,9 +159,9 @@
       return APR_INPARENT;
   }
   
  -ap_status_t ap_create_process(ap_context_t *cont, char *progname,
  +ap_status_t ap_create_process(struct proc_t **new, char *progname,
                                 char *const args[], char **env,
  -                              struct procattr_t *attr, struct proc_t **new)
  +                              struct procattr_t *attr, ap_context_t *cont)
   {
       int i;
       ap_status_t stat;
  
  
  
  1.4       +3 -3      apache-2.0/src/lib/apr/threadproc/os2/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/thread.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- thread.c	1999/10/04 16:37:38	1.3
  +++ thread.c	1999/10/11 17:52:13	1.4
  @@ -99,9 +99,9 @@
   
   
   
  -ap_status_t ap_create_thread(ap_context_t *cont, struct threadattr_t *attr, 
  +ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
  -                             struct thread_t **new)
  +                             ap_context_t *cont)
   {
       ap_status_t stat;
       ap_thread_t *thread;
  @@ -154,7 +154,7 @@
   
   
   
  -ap_status_t ap_thread_join(struct thread_t *thd, ap_status_t *retval)
  +ap_status_t ap_thread_join(ap_status_t *retval, struct thread_t *thd)
   {
       ULONG rc;
       TID waittid = thd->tid;
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/threadproc/os2/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadcancel.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadcancel.c	1999/08/17 15:59:50	1.1
  +++ threadcancel.c	1999/10/11 17:52:13	1.2
  @@ -65,7 +65,7 @@
   
       
   
  -ap_status_t ap_setcanceltype(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcanceltype(ap_int32_t type, ap_context_t *cont)
   {
       ULONG rc, nesting;
   
  @@ -79,7 +79,7 @@
   
   
   
  -ap_status_t ap_setcancelstate(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont)
   {
   /* There's no way to ignore thread kills altogether in OS/2 (that I know of) */
       return -1;
  
  
  
  1.3       +3 -3      apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadpriv.c	1999/10/04 16:37:38	1.2
  +++ threadpriv.c	1999/10/11 17:52:14	1.3
  @@ -60,8 +60,8 @@
   #include "apr_lib.h"
   #include "fileio.h"
   
  -ap_status_t ap_create_thread_private(ap_context_t *cont, void (*dest)(void *),
  -                                     struct threadkey_t **key)
  +ap_status_t ap_create_thread_private(struct threadkey_t **key,
  +                                     void (*dest)(void *), ap_context_t *cont)
   {
       (*key) = (struct threadkey_t *)ap_palloc(cont, sizeof(struct threadkey_t));
   
  @@ -79,7 +79,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_thread_private(struct threadkey_t *key, void *priv)
  +ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
   {
       *(key->key) = (ULONG)priv;
       return APR_SUCCESS;
  
  
  
  1.6       +5 -5      apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- proc.c	1999/10/11 14:20:43	1.5
  +++ proc.c	1999/10/11 17:52:17	1.6
  @@ -299,9 +299,9 @@
    *        process
    * arg 6) The resulting process handle.
    */
  -ap_status_t ap_create_process(struct proc_t **new, ap_context_t *cont, 
  -                              const char *progname, char *const args[],
  -                              char **env, struct procattr_t *attr)
  +ap_status_t ap_create_process(struct proc_t **new, const char *progname, 
  +                              char *const args[], char **env,
  +                              struct procattr_t *attr, ap_context_t *cont)
   {
       int i;
       char **newargs;
  @@ -460,12 +460,12 @@
   } 
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_os_proc(ap_proc_t *, ap_os_proc_t *)
  + * ap_status_t ap_get_os_proc(ap_os_proc_t *, ap_proc_t *)
    *    convert the proc from os specific type to apr type.
    * arg 1) The apr proc to converting
    * arg 2) The os specific proc we are converting to
    */
  -ap_status_t ap_get_os_proc(ap_proc_t *proc, ap_os_proc_t *theproc)
  +ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
   {
       if (proc == NULL) {
           return APR_ENOPROC;
  
  
  
  1.6       +5 -4      apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- procsup.c	1999/10/08 20:04:34	1.5
  +++ procsup.c	1999/10/11 17:52:18	1.6
  @@ -133,12 +133,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_procdata(ap_proc_t *, char *, void *)
  + * ap_status_t ap_get_procdata(char *, void *, ap_proc_t *)
    *    Return the context associated with the current proc.
    * arg 1) The currently open proc.
    * arg 2) The user data associated with the proc.
    */
  -ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data)
  +ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
   {
       if (proc != NULL) {
           return ap_get_userdata(&data, key, proc->cntxt);
  @@ -156,8 +156,9 @@
    * arg 1) The currently open proc.
    * arg 2) The user data to associate with the proc.
   */
  -ap_status_t ap_set_procdata(struct proc_t *proc, void *data, char *key, 
  -                            ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_procdata(void *data, char *key, 
  +                            ap_status_t (*cleanup) (void *),
  +                            struct proc_t *proc)
   {
       if (proc != NULL) {
           return ap_set_userdata(data, key, cleanup, proc->cntxt);
  
  
  
  1.6       +19 -17    apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- thread.c	1999/10/08 20:04:34	1.5
  +++ thread.c	1999/10/11 17:52:19	1.6
  @@ -131,9 +131,9 @@
    * arg 4) Any data to be passed to the starting function
    * arg 5) The newly created thread handle.
    */
  -ap_status_t ap_create_thread(ap_context_t *cont, struct threadattr_t *attr, 
  +ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
  -                             struct thread_t **new)
  +                             ap_context_t *cont)
   {
       ap_status_t stat;
       pthread_attr_t *temp;
  @@ -184,12 +184,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_thread_join(ap_thread_t *, ap_status_t *)
  + * ap_status_t ap_thread_join(ap_status_t *, ap_thread_t *)
    *    block until the desired thread stops executing. 
    * arg 1) The thread to join
    * arg 2) The return value from the dead thread.
    */
  -ap_status_t ap_thread_join(struct thread_t *thd, ap_status_t *retval)
  +ap_status_t ap_thread_join(ap_status_t *retval, struct thread_t *thd)
   {
       ap_status_t stat;
   
  @@ -219,12 +219,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_threaddata(ap_thread_t *, char *, void *)
  + * ap_status_t ap_get_threaddata(void *, char *, ap_thread_t *)
    *    Return the context associated with the current thread.
    * arg 1) The currently open thread.
    * arg 2) The user data associated with the thread.
    */
  -ap_status_t ap_get_threaddata(struct thread_t *thread, char *key, void *data)
  +ap_status_t ap_get_threaddata(void *data, char *key, struct thread_t *thread)
   {
       if (thread != NULL) {
           return ap_get_userdata(&data, key, thread->cntxt);
  @@ -242,8 +242,9 @@
    * arg 1) The currently open thread.
    * arg 2) The user data to associate with the thread.
    */
  -ap_status_t ap_set_threaddata(struct thread_t *thread, void *data, char *key,
  -                              ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_threaddata(void *data, char *key,
  +                              ap_status_t (*cleanup) (void *),
  +                              struct thread_t *thread)
   {
       if (thread != NULL) {
           return ap_set_userdata(data, key, cleanup, thread->cntxt);
  @@ -260,7 +261,7 @@
    * arg 1) The apr thread to convert
    * arg 2) The os specific thread we are converting to
    */
  -ap_status_t ap_get_os_thread(struct thread_t *thd, ap_os_thread_t *thethd)
  +ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct thread_t *thd)
   {
       if (thd == NULL) {
           return APR_ENOTHREAD;
  @@ -307,9 +308,9 @@
       return APR_NOTDETACH;
   }
   
  -ap_status_t ap_create_thread(ap_context_t *cont, struct threadattr_t *attr, 
  +ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
  -                             struct thread_t **new)
  +                             ap_context_t *cont)
   {
       *new = NULL;
       return stat;
  @@ -320,7 +321,7 @@
       APR_SUCCESS;
   }
   
  -ap_status_t ap_thread_join(struct thread_t *thd, ap_status_t *retval)
  +ap_status_t ap_thread_join(ap_status_t *retval, struct thread_t *thd)
   {
       return APR_SUCCESS;
   }
  @@ -331,12 +332,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_threaddata(ap_thread_t *, char *, void *)
  + * ap_status_t ap_get_threaddata(void *, char *, ap_thread_t *)
    *    Return the context associated with the current thread.
    * arg 1) The currently open thread.
    * arg 2) The user data associated with the thread.
    */
  -ap_status_t ap_get_threaddata(struct thread_t *thread, char *key, void *data)
  +ap_status_t ap_get_threaddata(void *data, char *key, struct thread_t *thread)
   {
       data = NULL;
       return APR_ENOTHREAD;
  @@ -349,13 +350,14 @@
    * arg 1) The currently open thread.
    * arg 2) The user data to associate with the thread.
    */
  -ap_status_t ap_set_threaddata(struct thread_t *thread, void *data, char *key,
  -                              ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_threaddata(void *data, char *key,
  +                              ap_status_t (*cleanup) (void *),
  +                              struct thread_t *thread)
   {
       return APR_ENOTHREAD;
   }
   
  -ap_status_t ap_get_os_thread(struct thread_t *thd, ap_os_thread_t *thethd)
  +ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct thread_t *thd)
   {
       thethd = NULL;
       return APR_SUCCESS;
  
  
  
  1.3       +6 -6      apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- threadcancel.c	1999/09/12 11:06:26	1.2
  +++ threadcancel.c	1999/10/11 17:52:19	1.3
  @@ -78,14 +78,14 @@
   #endif
       
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setcanceltype(ap_context_t *, ap_int32_t)
  + * ap_status_t ap_setcanceltype(ap_int32_t, ap_context_t *)
    *    Determine how threads are cancelable.
    * arg 1) The context to operate on 
    * arg 2) how are threads cancelable.  One of:
    *            APR_CANCEL_ASYNCH  -- cancel it no matter where it is
    *            APR_CANCEL_DEFER   -- only cancel the thread if it is safe. 
    */
  -ap_status_t ap_setcanceltype(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcanceltype(ap_int32_t type, ap_context_t *cont)
   {
       ap_status_t stat;
       if ((stat = pthread_setcanceltype(type, NULL)) == 0) {
  @@ -97,12 +97,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_setcancelstate(ap_context_t *, ap_int32_t)
  + * ap_status_t ap_setcancelstate(ap_int32_t, ap_context_t *)
    *    Determine if threads will be cancelable.
    * arg 1) The context to operate on 
    * arg 2) Are threads cancelable. 
    */
  -ap_status_t ap_setcancelstate(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont)
   {
       ap_status_t stat;
       if ((stat = pthread_setcanceltype(type, NULL)) == 0) {
  @@ -118,12 +118,12 @@
       return APR_SUCCESS;
   }
       
  -ap_status_t ap_setcanceltype(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcanceltype(ap_int32_t type, ap_context_t *cont)
   {
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setcancelstate(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont)
   {
       return APR_SUCCESS;
   }
  
  
  
  1.6       +20 -17    apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- threadpriv.c	1999/10/08 20:04:35	1.5
  +++ threadpriv.c	1999/10/11 17:52:19	1.6
  @@ -69,8 +69,8 @@
    * arg 2) The destructor to use when freeing the private memory.
    * arg 3) The thread private handle.
    */
  -ap_status_t ap_create_thread_private(ap_context_t *cont, void (*dest)(void *),
  -                                     struct threadkey_t **key)
  +ap_status_t ap_create_thread_private(struct threadkey_t **key, 
  +                                     void (*dest)(void *), ap_context_t *cont)
   {
       ap_status_t stat;
       (*key) = (struct threadkey_t *)ap_palloc(cont, sizeof(struct threadkey_t));
  @@ -100,12 +100,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_set_thread_private(ap_key_t *, void *)
  + * ap_status_t ap_set_thread_private(void *, ap_key_t *)
    *    Set the data to be stored in thread private memory
    * arg 1) The handle for the desired thread private memory 
    * arg 2) The data to be stored in private memory 
    */
  -ap_status_t ap_set_thread_private(struct threadkey_t *key, void *priv)
  +ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
   {
       ap_status_t stat;
       if ((stat = pthread_setspecific(key->key, priv)) == 0) {
  @@ -131,12 +131,12 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_get_threadkeydata(ap_threadkey_t *, char *, void *)
  + * ap_status_t ap_get_threadkeydata(void *, char *, ap_threadkey_t *)
    *    Return the context associated with the current threadkey.
    * arg 1) The currently open threadkey.
    * arg 2) The user data associated with the threadkey.
    */
  -ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, char *key, void *data)
  +ap_status_t ap_get_threadkeydata(void *data, char *key, struct threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_get_userdata(&data, key, threadkey->cntxt);
  @@ -154,8 +154,9 @@
    * arg 1) The currently open threadkey.
    * arg 2) The user data to associate with the threadkey.
    */
  -ap_status_t ap_set_threadkeydata(struct threadkey_t *threadkey, void *data,
  -                                 char *key, ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_threadkeydata(void *data,
  +                                 char *key, ap_status_t (*cleanup) (void *),
  +                                 struct threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_set_userdata(data, key, cleanup, threadkey->cntxt);
  @@ -173,7 +174,7 @@
    * arg 1) The apr handle we are converting from.
    * arg 2) The os specific handle we are converting to.
    */
  -ap_status_t ap_get_os_threadkey(struct threadkey_t *key, ap_os_threadkey_t *thekey)
  +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct threadkey_t *key)
   {
       if (key == NULL) {
           return APR_ENOFILE;
  @@ -204,8 +205,8 @@
       return APR_SUCCESS;
   }           
   #else
  -ap_status_t ap_create_thread_private(ap_context_t *cont, void (*dest)(void *),
  -                                     struct threadkey_t **key)
  +ap_status_t ap_create_thread_private(struct threadkey_t **key,
  +                                    void (*dest)(void *), ap_context_t *cont)
   {
       *key = NULL;
       return APR_SUCCESS;
  @@ -217,7 +218,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_thread_private(struct threadkey_t *key, void *priv)
  +ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
   {
       return APR_SUCCESS;
   }
  @@ -233,7 +234,7 @@
    * arg 1) The currently open threadkey.
    * arg 2) The user data associated with the threadkey.
    */
  -ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, void *data)
  +ap_status_t ap_get_threadkeydata(void *data, char *key, struct threadkey_t *threadkey)
   {
       return APR_SUCCESS;
   }
  @@ -244,19 +245,21 @@
    * arg 1) The currently open threadkey.
    * arg 2) The user data to associate with the threadkey.
    */
  -ap_status_t ap_set_threadkeydata(struct threadkey_t *threadkey, void *data)
  +ap_status_t ap_set_threadkeydata(void *data,
  +                                 char *key, ap_status_t (*cleanup) (void *),
  +                                 struct threadkey_t *threadkey)
   {
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_threadkey(struct threadkey_t *key, ap_os_threadkey_t *thekey)
  +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct threadkey_t *key)
   {
       thekey = NULL;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_threadkey(ap_context_t *cont, struct threadkey_t **key,
  -                                ap_os_threadkey_t *thekey)
  +ap_status_t ap_put_os_threadkey(struct threadkey_t **key,
  +                                ap_os_threadkey_t *thekey, ap_context_t *cont)
   {
       return APR_SUCCESS;
   }           
  
  
  
  1.6       +8 -7      apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- proc.c	1999/10/08 20:04:38	1.5
  +++ proc.c	1999/10/11 17:52:20	1.6
  @@ -139,9 +139,9 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_create_process(ap_context_t *cont, char *progname, 
  -                               char *const args[], char **env, 
  -                               struct procattr_t *attr, struct proc_t **new)
  +ap_status_t ap_create_process(struct proc_t **new, char *progname, 
  +                              char *const args[], char **env, 
  +                              struct procattr_t *attr, ap_context_t *cont)
   {
       int i, iEnvBlockLen;
   	char *cmdline;
  @@ -338,7 +338,7 @@
           return APR_EEXIST;
   } 
   
  -ap_status_t ap_get_procdata(struct proc_t *proc, char *key, void *data)
  +ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
   {
       if (proc != NULL) {
           return ap_get_userdata(&data, key, proc->cntxt);
  @@ -349,8 +349,9 @@
       }
   }
   
  -ap_status_t ap_set_procdata(struct proc_t *proc, void *data, char *key,
  -                            ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_procdata(void *data, char *key,
  +                            ap_status_t (*cleanup) (void *)
  +                            struct proc_t *proc)
   {
       if (proc != NULL) {
           return ap_set_userdata(data, key, cleanup, proc->cntxt);
  @@ -361,7 +362,7 @@
       }
   }
   
  -ap_status_t ap_get_os_proc(ap_proc_t *proc, ap_os_proc_t *theproc)
  +ap_status_t ap_get_os_proc(ap_os_proc_t *theproc, ap_proc_t *proc)
   {
       if (proc == NULL) {
           return APR_ENOPROC;
  
  
  
  1.7       +8 -7      apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- thread.c	1999/10/08 20:04:39	1.6
  +++ thread.c	1999/10/11 17:52:21	1.7
  @@ -87,9 +87,9 @@
       return APR_NOTDETACH;
   }
   
  -ap_status_t ap_create_thread(ap_context_t *cont, struct threadattr_t *attr, 
  +ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
  -                             struct thread_t **new)
  +                             ap_context_t *cont)
   {
       ap_status_t stat;
   	unsigned temp;
  @@ -131,7 +131,7 @@
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_thread_join(struct thread_t *thd, ap_status_t *retval)
  +ap_status_t ap_thread_join(ap_status_t *retval, struct thread_t *thd)
   {
       ap_status_t stat;
   
  @@ -156,7 +156,7 @@
       }
   }
   
  -ap_status_t ap_get_threaddata(struct thread_t *thread, char *key, void *data)
  +ap_status_t ap_get_threaddata(void *data, char *key, struct thread_t *thread)
   {
       if (thread != NULL) {
           return ap_get_userdata(&data, key, thread->cntxt);
  @@ -167,8 +167,9 @@
       }
   }
   
  -ap_status_t ap_set_threaddata(struct thread_t *thread, void *data, char *key,
  -                              ap_status_t (*cleanup) (void *))
  +ap_status_t ap_set_threaddata(void *data, char *key,
  +                              ap_status_t (*cleanup) (void *),
  +                              struct thread_t *thread)
   {
       if (thread != NULL) {
           return ap_set_userdata(data, key, cleanup, thread->cntxt);
  @@ -179,7 +180,7 @@
       }
   }
   
  -ap_status_t ap_get_os_thread(struct thread_t *thd, ap_os_thread_t *thethd)
  +ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct thread_t *thd)
   {
       if (thd == NULL) {
           return APR_ENOTHREAD;
  
  
  
  1.2       +2 -2      apache-2.0/src/lib/apr/threadproc/win32/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadcancel.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- threadcancel.c	1999/08/17 15:59:51	1.1
  +++ threadcancel.c	1999/10/11 17:52:22	1.2
  @@ -69,12 +69,12 @@
   }
   
   /*  Not sure of the best way to do this just yet.
  -ap_status_t ap_setcanceltype(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcanceltype(ap_int32_t type, ap_context_t *cont)
   {
   	
   }
   
  -ap_status_t ap_setcancelstate(ap_context_t *cont, ap_int32_t type)
  +ap_status_t ap_setcancelstate(ap_int32_t type, ap_context_t *cont)
   {
       ap_status_t stat;
       if ((stat = pthread_setcanceltype(type, NULL)) == 0) {
  
  
  
  1.6       +5 -5      apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- threadpriv.c	1999/10/08 20:04:39	1.5
  +++ threadpriv.c	1999/10/11 17:52:22	1.6
  @@ -60,8 +60,8 @@
   #include "apr_errno.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_create_thread_private(ap_context_t *cont, void (*dest)(void *),
  -                                     struct threadkey_t **key)
  +ap_status_t ap_create_thread_private(struct threadkey_t **key,
  +                                     void (*dest)(void *), ap_context_t *cont)
   {
   	(*key)->key = TlsAlloc();
   	return APR_SUCCESS;
  @@ -75,7 +75,7 @@
       return APR_EEXIST;
   }
   
  -ap_status_t ap_set_thread_private(struct threadkey_t *key, void *priv)
  +ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
   {
       if (TlsSetValue(key->key, priv)) {
           return APR_SUCCESS;
  @@ -91,7 +91,7 @@
       return APR_EEXIST;
   }
   
  -ap_status_t ap_get_threadkeydata(struct threadkey_t *threadkey, char *key, void *data)
  +ap_status_t ap_get_threadkeydata(void *data, char *key, struct threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_get_userdata(&data, key, threadkey->cntxt);
  @@ -114,7 +114,7 @@
       }
   }
   
  -ap_status_t ap_get_os_threadkey(struct threadkey_t *key, ap_os_threadkey_t *thekey)
  +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct threadkey_t *key)
   {
       if (key == NULL) {
           return APR_ENOFILE;
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/time/unix/time.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- time.c	1999/10/06 06:48:52	1.5
  +++ time.c	1999/10/11 17:52:27	1.6
  @@ -81,7 +81,7 @@
       }
   
       (*new)->cntxt = cont;
  -    (*new)->explodedtime = NULL;
  +    (*new)->explodedtime = ap_palloc(cont, sizeof(struct tm));
       (*new)->currtime = NULL;
       return APR_SUCCESS;
   }
  
  
  
  1.10      +4 -4      apache-2.0/src/main/http_log.c
  
  Index: http_log.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- http_log.c	1999/10/11 14:20:45	1.9
  +++ http_log.c	1999/10/11 17:52:28	1.10
  @@ -187,7 +187,7 @@
           rc = -1;
       }
       else {
  -        rc = ap_create_process(&procnew, p, progname, NULL, NULL, procattr);
  +        rc = ap_create_process(&procnew, progname, NULL, NULL, procattr, p);
       
           if (rc == APR_SUCCESS) {
   #ifndef WIN32
  @@ -195,7 +195,7 @@
                *       stages. ap_note_subprocess and free_proc need to be redone
                *       to make use of ap_proc_t instead of pid.
                */
  -            ap_get_os_proc(procnew, &fred);
  +            ap_get_os_proc(&fred, procnew);
               ap_note_subprocess(p, fred, kill_after_timeout);
   #endif
               if (fpin) {
  @@ -638,13 +638,13 @@
           rc = -1;
       }
       else {
  -        rc = ap_create_process(pl->p, pl->program, NULL, NULL, procattr, &procnew);
  +        rc = ap_create_process(&procnew, pl->program, NULL, NULL, procattr, pl->p);
       
           if (rc == APR_SUCCESS) {            /* pjr - This no longer happens inside the
child, */
               RAISE_SIGSTOP(PIPED_LOG_SPAWN); /*   I am assuming that if ap_create_process
was  */
                                               /*   successful that the child is running.
       */
               pl->pid = procnew;
  -            ap_get_os_proc(&procnew, &pid);
  +            ap_get_os_proc(&pid, &procnew);
               ap_register_other_child(pid, piped_log_maintenance, pl, pl->fds[1]);
           }
       }
  
  
  

Mime
View raw message