From: Justin Erenkrantz Date: Fri, 4 Feb 2005 00:12:15 +0000 (+0000) Subject: If thread_num is long, this better be an %ld X-Git-Tag: 2.0.53~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aabf1f5375a2e89b116d850c03a39df72974e5c8;p=thirdparty%2Fapache%2Fhttpd.git If thread_num is long, this better be an %ld MFC: 106653 Reviewed by: wrowe, nd, trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151265 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index bc7edcc70d3..f5f7bb51731 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ Changes with Apache 2.0.53 + *) Win32 MPM: Correct typo in debugging output. [William Rowe] + *) conf: Remove AddDefaultCharset from the default configuration because setting a site-wide default does more harm than good. PR 23421. [Roy Fielding] diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index 0fb47b9c510..1ee54caf25f 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -691,7 +691,7 @@ static void worker_main(long thread_num) ap_sb_handle_t *sbh; ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ap_server_conf, - "Child %d: Worker thread %d starting.", my_pid, thread_num); + "Child %d: Worker thread %ld starting.", my_pid, thread_num); while (1) { conn_rec *c; apr_int32_t disconnected; @@ -752,7 +752,7 @@ static void worker_main(long thread_num) (request_rec *) NULL); ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, ap_server_conf, - "Child %d: Worker thread %d exiting.", my_pid, thread_num); + "Child %d: Worker thread %ld exiting.", my_pid, thread_num); }