You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/07/05 20:02:07 UTC
cvs commit: apache-2.0/src/modules/standard mod_log_config.c
rbb 00/07/05 11:02:05
Modified: src/main http_protocol.c
src/modules/mpm/dexter dexter.c
src/modules/mpm/mpmt_pthread mpm.h mpmt_pthread.c
src/modules/standard mod_log_config.c
Log:
Remove some warnings from the latest compile. I don't know why these
haven't turned up before. We were using the wrong types in our printf
calls for times.
Revision Changes Path
1.91 +2 -2 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- http_protocol.c 2000/07/04 00:28:23 1.90
+++ http_protocol.c 2000/07/05 18:00:58 1.91
@@ -302,7 +302,7 @@
long tlength = 0;
r->byterange = 2;
- r->boundary = ap_psprintf(r->pool, "%lx%lx",
+ r->boundary = ap_psprintf(r->pool, "%llx%lx",
r->request_time, (long) getpid());
while (internal_byterange(0, &tlength, r, &r_range, NULL, NULL));
ap_table_setn(r->headers_out, "Content-Length",
@@ -1309,7 +1309,7 @@
{
ap_table_setn(r->err_headers_out,
r->proxyreq ? "Proxy-Authenticate" : "WWW-Authenticate",
- ap_psprintf(r->pool, "Digest realm=\"%s\", nonce=\"%lu\"",
+ ap_psprintf(r->pool, "Digest realm=\"%s\", nonce=\"%llx\"",
ap_auth_name(r), r->request_time));
}
1.108 +3 -3 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- dexter.c 2000/06/30 21:18:23 1.107
+++ dexter.c 2000/07/05 18:01:12 1.108
@@ -151,8 +151,8 @@
static pthread_mutex_t thread_pool_parent_mutex;
static int child_num;
-static int my_pid; /* Linux getpid() doesn't work except in main thread. Use
- this instead */
+static unsigned int my_pid; /* Linux getpid() doesn't work except in
+ main thread. Use this instead */
/* Keep track of the number of worker threads currently active */
static int worker_thread_count;
static pthread_mutex_t worker_thread_count_mutex;
@@ -1087,7 +1087,7 @@
ap_log_pid(pconf, ap_pid_fname);
/* Initialize cross-process accept lock */
- lock_fname = ap_psprintf(_pconf, "%s.%lu",
+ lock_fname = ap_psprintf(_pconf, "%s.%u",
ap_server_root_relative(_pconf, lock_fname),
my_pid);
rv = SAFE_ACCEPT(ap_create_lock(&process_accept_mutex, APR_MUTEX,
1.4 +1 -1 apache-2.0/src/modules/mpm/mpmt_pthread/mpm.h
Index: mpm.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpm.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mpm.h 2000/06/23 18:12:44 1.3
+++ mpm.h 2000/07/05 18:01:20 1.4
@@ -67,7 +67,7 @@
extern int ap_max_requests_per_child;
extern int ap_extended_status;
extern int ap_max_daemons_limit;
-extern int ap_my_pid;
+extern unsigned int ap_my_pid;
extern server_rec *ap_server_conf;
extern scoreboard *ap_scoreboard_image;
extern void clean_child_exit(int);
1.102 +3 -3 apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- mpmt_pthread.c 2000/06/30 21:18:26 1.101
+++ mpmt_pthread.c 2000/07/05 18:01:22 1.102
@@ -151,8 +151,8 @@
static ap_pool_t *pconf; /* Pool for config stuff */
static ap_pool_t *pchild; /* Pool for httpd child stuff */
-int ap_my_pid; /* Linux getpid() doesn't work except in main thread. Use
- this instead */
+unsigned int ap_my_pid; /* Linux getpid() doesn't work except in main
+ thread. Use this instead */
/* Keep track of the number of worker threads currently active */
static int worker_thread_count;
static pthread_mutex_t worker_thread_count_mutex;
@@ -1110,7 +1110,7 @@
ap_log_pid(pconf, ap_pid_fname);
/* Initialize cross-process accept lock */
- lock_fname = ap_psprintf(_pconf, "%s.%lu",
+ lock_fname = ap_psprintf(_pconf, "%s.%u",
ap_server_root_relative(_pconf, lock_fname),
ap_my_pid);
rv = ap_create_lock(&process_accept_mutex, APR_MUTEX, APR_CROSS_PROCESS,
1.28 +1 -1 apache-2.0/src/modules/standard/mod_log_config.c
Index: mod_log_config.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_log_config.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_log_config.c 2000/06/28 14:33:41 1.27
+++ mod_log_config.c 2000/07/05 18:01:52 1.28
@@ -432,7 +432,7 @@
static const char *log_request_duration(request_rec *r, char *a)
{
- return ap_psprintf(r->pool, "%ld", (ap_now() - r->request_time) / AP_USEC_PER_SEC);
+ return ap_psprintf(r->pool, "%lld", (ap_now() - r->request_time) / AP_USEC_PER_SEC);
}
/* These next two routines use the canonical name:port so that log