support error log id as variables

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033167 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/expr.xml b/docs/manual/expr.xml
index 67fd7a47b74fb3c775601486e0dc07a722374108..b3ef8e9305eb0082f62327ac5caa1a12cbf9a742 100644 (file)
--- a/docs/manual/expr.xml
+++ b/docs/manual/expr.xml
@@ -169,6 +169,10 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</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>
 

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 1901666fa295f8f6f7b9aa76e8bfca735e90d3a7..c136b50d37e23e72e1be27910f1543e65bc898a0 100644 (file)
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -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_eval_ctx *ctx, const void *data)
 #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_expr_eval_ctx *ctx, const void *data)
         return r->content_type;
     case 19:
         return r->handler;
+    case 20:
+        return r->log_id;
     default:
         ap_assert(0);
         return NULL;