httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1726057 - in /httpd/httpd/trunk: CHANGES docs/manual/expr.xml server/util_expr_eval.c
Date Thu, 21 Jan 2016 18:41:22 GMT
Author: jim
Date: Thu Jan 21 18:41:21 2016
New Revision: 1726057

URL: http://svn.apache.org/viewvc?rev=1726057&view=rev
Log:
revert

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/docs/manual/expr.xml
    httpd/httpd/trunk/server/util_expr_eval.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1726057&r1=1726056&r2=1726057&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Jan 21 18:41:21 2016
@@ -19,9 +19,6 @@ Changes with Apache 2.5.0
      APR_TIMEUP and preserving connection state for later retry.
      [Stefan Eissing]
      
-  *) ap_expr: expression support for r->kept_body if it exists.
-     [Jim Jagielski]
-
   *) mod_http2: bytes read/written on slave connections are reported via the
      optional mod_logio functions. Fixes PR 58871.
      

Modified: httpd/httpd/trunk/docs/manual/expr.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml?rev=1726057&r1=1726056&r2=1726057&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml Thu Jan 21 18:41:21 2016
@@ -501,10 +501,6 @@ listfunction ::= listfuncname "<strong>(
         <td>Lookup operating system environment variable</td><td></td></tr>
     <tr><td><code>note</code></td>
         <td>Lookup request note</td><td></td></tr>
-    <tr><td><code>kept_body</code></td>
-        <td>Lookup response body if available in <code>r->kept_body</code>.
<em>Note:</em>
-        function argument is required but ignored.
-        </td><td></td></tr>
     <tr><td><code>env</code></td>
         <td>Return first match of <code>note</code>, <code>reqenv</code>,
             <code>osenv</code></td><td></td></tr>

Modified: httpd/httpd/trunk/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_eval.c?rev=1726057&r1=1726056&r2=1726057&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_eval.c (original)
+++ httpd/httpd/trunk/server/util_expr_eval.c Thu Jan 21 18:41:21 2016
@@ -1049,30 +1049,6 @@ static const char *req_table_func(ap_exp
     return apr_table_get(t, arg);
 }
 
-static const char *kb_func(ap_expr_eval_ctx_t *ctx, const void *data,
-                                  const char *arg)
-{
-    apr_off_t length;
-    apr_size_t len;
-    apr_status_t rv;
-    char *buf;
-
-    if (!ctx->r || !ctx->r->kept_body)
-        return "";
-
-    rv = apr_brigade_length(ctx->r->kept_body, 1, &length);
-    len = (apr_size_t)length;;
-    if (rv != APR_SUCCESS || len == 0)
-        return "";
-
-    buf = apr_palloc(ctx->r->pool, len+1);
-    rv = apr_brigade_flatten(ctx->r->kept_body, buf, &len);
-    if (rv != APR_SUCCESS)
-        return "";
-    buf[len] = '\0'; /* ensure */
-    return (const char*)buf;
-}
-
 static const char *env_func(ap_expr_eval_ctx_t *ctx, const void *data,
                             const char *arg)
 {
@@ -1809,7 +1785,6 @@ static const struct expr_provider_single
     { unbase64_func,        "unbase64",       NULL, 0 },
     { sha1_func,            "sha1",           NULL, 0 },
     { md5_func,             "md5",            NULL, 0 },
-    { kb_func,             "kept_body",       NULL, 0 },
 #if APR_VERSION_AT_LEAST(1,6,0)
     { ldap_func,            "ldap",           NULL, 0 },
 #endif



Mime
View raw message