From: Jim Jagielski Date: Tue, 28 Jun 2016 11:44:15 +0000 (+0000) Subject: Merge r1749401, r1749404 from trunk: X-Git-Tag: 2.4.23~31 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c9ae113e8999ce353b70eb7efe0d160ad932ef4;p=apache Merge r1749401, r1749404 from trunk: 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 --- diff --git a/CHANGES b/CHANGES index dd002f7320..4ba72a611d 100644 --- 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 adb55aa8cc..a6bc934d5c 100644 --- 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 index 8144eefdb8..0000000000 --- a/docs/manual/mod/mod_proxy_http2.html +++ /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 index 8a87a10913..0000000000 --- a/docs/manual/mod/mod_proxy_http2.html.en +++ /dev/null @@ -1,122 +0,0 @@ - - - - - -mod_proxy_http2 - Apache HTTP Server Version 2.4 - - - - - - - - -

-

-Apache > HTTP Server > Documentation > Version 2.4 > Modules

-

-

Apache Module mod_proxy_http2

-

-

Available Languages: en

-

- - - -

Description:	HTTP/2 support module for -`mod_proxy`
Status:	Extension
Module Identifier:	proxy_http2_module
Source File:	mod_proxy_http2.c

-

Summary

- -

This module requires the service of mod_proxy. It provides the features used for - proxying HTTP/2 requests. mod_proxy_http2 - supports HTTP/2 only. It does not - provide any downgrades to HTTP/1.1.

- -

Thus, in order to get the ability of handling HTTP/2 proxy requests, - mod_proxy and mod_proxy_http2 - have to be present in the server.

- -

mod_proxy_http2 works with incoming requests - over HTTP/1.1 and HTTP/2 requests. If mod_http2 - handles the frontend connection, requests against the same HTTP/2 - backend are sent over a single connection, whenever possible.

- -

This module relies on libnghttp2 - to provide the core http/2 engine.

- -

Warning

-

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.

-

- -

Warning

-

Do not enable proxying until you have secured your server. Open proxy - servers are dangerous both to your network and to the Internet at - large.

-

-

-

Topics

-

Request notes

Directives

-

This module provides no - directives.

-

Bugfix checklist

See also

-

-

top

-

-

Request notes

-

mod_proxy_http creates the following request notes for - logging using the %{VARNAME}n format in - LogFormat or - ErrorLogFormat: -

-

proxy-source-port: The local port used for the connection to the backend server.
proxy-status: The HTTP/2 status received from the backend server.

-

-

-

-

Available Languages: en

-

top

Comments

Notice:
This is not a Q&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 mailing lists.

-

- \ 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 index 2ccd79bba6..0000000000 --- a/docs/manual/mod/mod_proxy_http2.xml.meta +++ /dev/null @@ -1,12 +0,0 @@ - - - - - mod_proxy_http2 - /mod/ - .. - - - en - - diff --git a/modules/filters/sed1.c b/modules/filters/sed1.c index 739e1ce9c1..8f383b8b0f 100644 --- a/modules/filters/sed1.c +++ b/modules/filters/sed1.c @@ -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); } /*