]> granicus.if.org Git - apache/commitdiff
Merge r1749401, r1749404 from trunk:
authorJim Jagielski <jim@apache.org>
Tue, 28 Jun 2016 11:44:15 +0000 (11:44 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 28 Jun 2016 11:44:15 +0000 (11:44 +0000)
Fix 'x' command processing in mod_sed.

This has been tested using a slighly modified example taken from:
    https://blogs.oracle.com/basant/entry/using_mod_sed_to_filter
(OutputSed "s/.\*//"             has been changed in                OutputSed "s/.*//")

OutputSed "/Sunday/ {"
OutputSed "h"
OutputSed "s/.*//"
OutputSed "N"
OutputSed "s/\^.//"
OutputSed     "/Monday/ {"
OutputSed         "x"
OutputSed         "s/Sunday/Monday/"
OutputSed         "x"
OutputSed         "s/Monday/Tuesday/"
OutputSed         "H"
OutputSed         "g"
OutputSed     "}"
OutputSed "}"

Add CHANGES entry for r1749401
Submitted by: jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750481 13f79535-47bb-0310-9956-ffa450edef68

CHANGES
STATUS
docs/manual/mod/mod_proxy_http2.html [deleted file]
docs/manual/mod/mod_proxy_http2.html.en [deleted file]
docs/manual/mod/mod_proxy_http2.xml.meta [deleted file]
modules/filters/sed1.c

diff --git a/CHANGES b/CHANGES
index dd002f73201c5c78b4a4ee8424b833bd7d3a3479..4ba72a611dab0b37626397701e7c12f05da5d778 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.23
 
+  *) mod_sed: Fix 'x' command processing. [Christophe Jaillet]
+
   *) configure: Fix ./configure edge-case failures around dependencies
      of mod_proxy_hcheck. [William Rowe, Ruediger Pluem, Jeff Trawick]
 
diff --git a/STATUS b/STATUS
index adb55aa8cc9da337d434a1127f11f762399462a5..a6bc934d5c08eee3309cf82e6e6b734a0a53bfcb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -116,11 +116,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_sed: Fix 'x' command processing
-     trunk patch: http://svn.apache.org/r1749401
-                  http://svn.apache.org/r1749404 (CHANGES entry)
-     2.4.x: trunk patch works
-     +1: jailletc36, rpluem, ylavic
 
   *) mod_proxy: Replace the logic for selecting proxy sub-modules, retaining
      the 2.4.x legacy behavior, by elevating the module selection to 'most'
diff --git a/docs/manual/mod/mod_proxy_http2.html b/docs/manual/mod/mod_proxy_http2.html
deleted file mode 100644 (file)
index 8144eef..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-# GENERATED FROM XML -- DO NOT EDIT
-
-URI: mod_proxy_http2.html.en
-Content-Language: en
-Content-type: text/html; charset=ISO-8859-1
diff --git a/docs/manual/mod/mod_proxy_http2.html.en b/docs/manual/mod/mod_proxy_http2.html.en
deleted file mode 100644 (file)
index 8a87a10..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"><head>
-<meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type" />
-<!--
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-              This file is generated from xml source: DO NOT EDIT
-        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-      -->
-<title>mod_proxy_http2 - Apache HTTP Server Version 2.4</title>
-<link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" />
-<link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" />
-<link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link rel="stylesheet" type="text/css" href="../style/css/prettify.css" />
-<script src="../style/scripts/prettify.min.js" type="text/javascript">
-</script>
-
-<link href="../images/favicon.ico" rel="shortcut icon" /></head>
-<body>
-<div id="page-header">
-<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p>
-<p class="apache">Apache HTTP Server Version 2.4</p>
-<img alt="" src="../images/feather.png" /></div>
-<div class="up"><a href="./"><img title="&lt;-" alt="&lt;-" src="../images/left.gif" /></a></div>
-<div id="path">
-<a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.4</a> &gt; <a href="./">Modules</a></div>
-<div id="page-content">
-<div id="preamble"><h1>Apache Module mod_proxy_http2</h1>
-<div class="toplang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_http2.html" title="English">&nbsp;en&nbsp;</a></p>
-</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>HTTP/2 support module for
-<code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></td></tr>
-<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Extension</td></tr>
-<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>proxy_http2_module</td></tr>
-<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_proxy_http2.c</td></tr></table>
-<h3>Summary</h3>
-
-    <p>This module <em>requires</em> the service of <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code>. It provides the features used for
-    proxying HTTP/2 requests. <code class="module"><a href="../mod/mod_proxy_http2.html">mod_proxy_http2</a></code>
-    supports HTTP/2 only. It does <em>not</em>
-    provide any downgrades to HTTP/1.1.</p>
-
-    <p>Thus, in order to get the ability of handling HTTP/2 proxy requests,
-    <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> and <code class="module"><a href="../mod/mod_proxy_http2.html">mod_proxy_http2</a></code>
-    have to be present in the server.</p>
-
-    <p><code class="module"><a href="../mod/mod_proxy_http2.html">mod_proxy_http2</a></code> works with incoming requests
-    over HTTP/1.1 and HTTP/2 requests. If <code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code>
-    handles the frontend connection, requests against the same HTTP/2
-    backend are sent over a single connection, whenever possible.</p>
-
-    <p>This module relies on <a href="http://nghttp2.org/">libnghttp2</a>
-    to provide the core http/2 engine.</p>
-
-    <div class="warning"><h3>Warning</h3>
-        <p>This module is experimental. Its behaviors, directives, and 
-        defaults are subject to more change from release to 
-        release relative to other standard modules. Users are encouraged to 
-        consult the "CHANGES" file for potential updates.</p>
-    </div>
-
-    <div class="warning"><h3>Warning</h3>
-      <p>Do not enable proxying until you have <a href="mod_proxy.html#access">secured your server</a>. Open proxy
-      servers are dangerous both to your network and to the Internet at
-      large.</p>
-    </div>
-</div>
-<div id="quickview"><h3>Topics</h3>
-<ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#notes">Request notes</a></li>
-</ul><h3 class="directives">Directives</h3>
-<p>This module provides no
-            directives.</p>
-<h3>Bugfix checklist</h3><ul class="seealso"><li><a href="https://www.apache.org/dist/httpd/CHANGES_2.4">httpd changelog</a></li><li><a href="https://bz.apache.org/bugzilla/buglist.cgi?bug_status=__open__&amp;list_id=144532&amp;product=Apache%20httpd-2&amp;query_format=specific&amp;order=changeddate%20DESC%2Cpriority%2Cbug_severity&amp;component=mod_proxy_http2">Known issues</a></li><li><a href="https://bz.apache.org/bugzilla/enter_bug.cgi?product=Apache%20httpd-2&amp;component=mod_proxy_http2">Report a bug</a></li></ul><h3>See also</h3>
-<ul class="seealso">
-<li><code class="module"><a href="../mod/mod_http2.html">mod_http2</a></code></li>
-<li><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></li>
-<li><code class="module"><a href="../mod/mod_proxy_connect.html">mod_proxy_connect</a></code></li>
-<li><a href="#comments_section">Comments</a></li></ul></div>
-<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
-<div class="section">
-<h2><a name="notes" id="notes">Request notes</a></h2>
-    <p><code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></code> creates the following request notes for
-        logging using the <code>%{VARNAME}n</code> format in
-        <code class="directive"><a href="../mod/mod_log_config.html#logformat">LogFormat</a></code> or
-        <code class="directive"><a href="../mod/core.html#errorlogformat">ErrorLogFormat</a></code>:
-    </p>
-    <dl>
-        <dt>proxy-source-port</dt>
-        <dd>The local port used for the connection to the backend server.</dd>
-        <dt>proxy-status</dt>
-        <dd>The HTTP/2 status received from the backend server.</dd>
-    </dl>
-</div>
-</div>
-<div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/mod/mod_proxy_http2.html" title="English">&nbsp;en&nbsp;</a></p>
-</div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&amp;A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
-<script type="text/javascript"><!--//--><![CDATA[//><!--
-var comments_shortname = 'httpd';
-var comments_identifier = 'http://httpd.apache.org/docs/2.4/mod/mod_proxy_http2.html';
-(function(w, d) {
-    if (w.location.hostname.toLowerCase() == "httpd.apache.org") {
-        d.write('<div id="comments_thread"><\/div>');
-        var s = d.createElement('script');
-        s.type = 'text/javascript';
-        s.async = true;
-        s.src = 'https://comments.apache.org/show_comments.lua?site=' + comments_shortname + '&page=' + comments_identifier;
-        (d.getElementsByTagName('head')[0] || d.getElementsByTagName('body')[0]).appendChild(s);
-    }
-    else { 
-        d.write('<div id="comments_thread">Comments are disabled for this page at the moment.<\/div>');
-    }
-})(window, document);
-//--><!]]></script></div><div id="footer">
-<p class="apache">Copyright 2016 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
-<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="http://wiki.apache.org/httpd/FAQ">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div><script type="text/javascript"><!--//--><![CDATA[//><!--
-if (typeof(prettyPrint) !== 'undefined') {
-    prettyPrint();
-}
-//--><!]]></script>
-</body></html>
\ No newline at end of file
diff --git a/docs/manual/mod/mod_proxy_http2.xml.meta b/docs/manual/mod/mod_proxy_http2.xml.meta
deleted file mode 100644 (file)
index 2ccd79b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
-
-<metafile reference="mod_proxy_http2.xml">
-  <basename>mod_proxy_http2</basename>
-  <path>/mod/</path>
-  <relpath>..</relpath>
-
-  <variants>
-    <variant>en</variant>
-  </variants>
-</metafile>
index 739e1ce9c1181f4a0301a5c9e16dc0e807bd0e4b..8f383b8b0f4f84f872dab51b7bbee45bc7a89e18 100644 (file)
@@ -235,6 +235,7 @@ static void copy_to_genbuf(sed_eval_t *eval, const char* sz)
     if (eval->gsize < reqsize) {
         grow_gen_buffer(eval, reqsize, NULL);
     }
+    memcpy(eval->genbuf, sz, len + 1);
 }
 
 /*