You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2005/10/11 18:25:23 UTC
svn commit: r312911 - in /httpd/httpd: branches/2.2.x/CHANGES
branches/2.2.x/modules/loggers/mod_log_config.c trunk/CHANGES
Author: colm
Date: Tue Oct 11 09:25:16 2005
New Revision: 312911
URL: http://svn.apache.org/viewcvs?rev=312911&view=rev
Log:
Merge r265033 from trunk.
Author: trawick
Reviewed by: colm
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c
httpd/httpd/trunk/CHANGES
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=312911&r1=312910&r2=312911&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct 11 09:25:16 2005
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.1.9
+ *) mod_log_config: %{hextid}P will log the thread id in hex with APR
+ versions 1.2.0 or higher. [Jeff Trawick]
+
*) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
in 1.3. [Jeff Trawick]
Modified: httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c?rev=312911&r1=312910&r2=312911&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c (original)
+++ httpd/httpd/branches/2.2.x/modules/loggers/mod_log_config.c Tue Oct 11 09:25:16 2005
@@ -650,13 +650,21 @@
if (*a == '\0' || !strcmp(a, "pid")) {
return ap_append_pid(r->pool, "", "");
}
- else if (!strcmp(a, "tid")) {
+ else if (!strcmp(a, "tid") || !strcmp(a, "hextid")) {
#if APR_HAS_THREADS
apr_os_thread_t tid = apr_os_thread_current();
#else
int tid = 0; /* APR will format "0" anyway but an arg is needed */
#endif
- return apr_psprintf(r->pool, "%pT", &tid);
+ return apr_psprintf(r->pool,
+#if APR_MAJOR_VERSION > 1 || (APR_MAJOR_VERSION == 1 && APR_MINOR_VERSION >= 2)
+ /* APR can format a thread id in hex */
+ *a == 'h' ? "%pt" : "%pT",
+#else
+ /* APR is missing the feature, so always use decimal */
+ "%pT",
+#endif
+ &tid);
}
/* bogus format */
return a;
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=312911&r1=312910&r2=312911&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Oct 11 09:25:16 2005
@@ -2,9 +2,6 @@
Changes with Apache 2.3.0
[Remove entries to the current 2.0 and 2.2 section below, when backported]
- *) mod_log_config: %{hextid}P will log the thread id in hex with APR
- versions 1.2.0 or higher. [Jeff Trawick]
-
*) mod_cgid: Refuse to work on Solaris 10 due to OS bugs. PR 34264.
[Justin Erenkrantz]
@@ -14,6 +11,9 @@
[Martin Kraemer, David Reid]
Changes with Apache 2.1.9
+
+ *) mod_log_config: %{hextid}P will log the thread id in hex with APR
+ versions 1.2.0 or higher. [Jeff Trawick]
*) httpd.exe/apachectl -V: display the DYNAMIC_MODULE_LIMIT setting, as
in 1.3. [Jeff Trawick]