You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2010/11/09 20:24:46 UTC
svn commit: r1033167 - in /httpd/httpd/trunk: docs/manual/expr.xml
server/util_expr_eval.c
Author: sf
Date: Tue Nov 9 19:24:45 2010
New Revision: 1033167
URL: http://svn.apache.org/viewvc?rev=1033167&view=rev
Log:
support error log id as variables
Modified:
httpd/httpd/trunk/docs/manual/expr.xml
httpd/httpd/trunk/server/util_expr_eval.c
Modified: httpd/httpd/trunk/docs/manual/expr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml?rev=1033167&r1=1033166&r2=1033167&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml Tue Nov 9 19:24:45 2010
@@ -169,6 +169,10 @@ listfunction ::= listfuncname "<strong>(
<td></td></tr>
<tr><td><code>IPV6</code></td>
<td></td></tr>
+ <tr><td><code>REQUEST_LOG_ID</code></td>
+ <td></td></tr>
+ <tr><td><code>CONN_LOG_ID</code></td>
+ <td></td></tr>
</table>
Modified: httpd/httpd/trunk/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_eval.c?rev=1033167&r1=1033166&r2=1033167&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_eval.c (original)
+++ httpd/httpd/trunk/server/util_expr_eval.c Tue Nov 9 19:24:45 2010
@@ -831,6 +831,7 @@ static const char *conn_var_names[] = {
"REMOTE_ADDR", /* 0 */
"HTTPS", /* 1 */
"IPV6", /* 2 */
+ "CONN_LOG_ID", /* 3 */
NULL
};
@@ -862,6 +863,8 @@ static const char *conn_var_fn(ap_expr_e
#else
return "off";
#endif
+ case 3:
+ return c->log_id;
default:
ap_assert(0);
return NULL;
@@ -889,6 +892,7 @@ static const char *request_var_names[] =
"THE_REQUEST", /* 17 */
"CONTENT_TYPE", /* 18 */
"HANDLER", /* 19 */
+ "REQUEST_LOG_ID", /* 20 */
NULL
};
@@ -941,6 +945,8 @@ static const char *request_var_fn(ap_exp
return r->content_type;
case 19:
return r->handler;
+ case 20:
+ return r->log_id;
default:
ap_assert(0);
return NULL;