[apache2] 03/04: Adapt patches + changelog

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit df6d5e139948b45139ea53f94f93b2029cd4df76
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Dec 19 09:23:20 2015 +0100

    Adapt patches + changelog
    
    Remove obsolete patches:
    - mod_http2_log_protocol.patch
    - revert-REDIRECT_URL.patch
---
 debian/changelog                            |  7 ++++++
 debian/patches/mod_http2_log_protocol.patch | 23 --------------------
 debian/patches/revert-REDIRECT_URL.patch    | 33 -----------------------------
 debian/patches/series                       |  2 --
 4 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c397c04..4caa17d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.18-1) UNRELEASED; urgency=medium
+
+  * New upstream release:
+    - mostly HTTP/2 improvements
+
+ -- Stefan Fritsch <sf at debian.org>  Sat, 19 Dec 2015 09:19:09 +0100
+
 apache2 (2.4.17-3) unstable; urgency=medium
 
   * mpm_prefork: Fix segfault if started with -X. Closes: #805737
diff --git a/debian/patches/mod_http2_log_protocol.patch b/debian/patches/mod_http2_log_protocol.patch
deleted file mode 100644
index 1210c53..0000000
--- a/debian/patches/mod_http2_log_protocol.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-# Put HTTP/2 into THE_REQUEST, affecting the access log
-# https://svn.apache.org/r1708319
---- apache2.orig/modules/http2/h2_task.c
-+++ apache2/modules/http2/h2_task.c
-@@ -379,8 +379,6 @@ static request_rec *h2_task_create_reque
-     
-     /* Time to populate r with the data we have. */
-     r->request_time = apr_time_now();
--    r->the_request = apr_psprintf(r->pool, "%s %s HTTP/1.1", 
--                                  env->method, env->path);
-     r->method = env->method;
-     /* Provide quick information about the request method as soon as known */
-     r->method_number = ap_method_number_of(r->method);
-@@ -391,6 +389,9 @@ static request_rec *h2_task_create_reque
-     ap_parse_uri(r, env->path);
-     r->protocol = (char*)"HTTP/2";
-     r->proto_num = HTTP_VERSION(2, 0);
-+
-+    r->the_request = apr_psprintf(r->pool, "%s %s %s", 
-+                                  r->method, env->path, r->protocol);
-     
-     /* update what we think the virtual host is based on the headers we've
-      * now read. may update status.
diff --git a/debian/patches/revert-REDIRECT_URL.patch b/debian/patches/revert-REDIRECT_URL.patch
deleted file mode 100644
index 283fbf7..0000000
--- a/debian/patches/revert-REDIRECT_URL.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# Revert REDIRECT_URL to pre-2.4.17 behavior
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803353
-# https://bz.apache.org/bugzilla/show_bug.cgi?id=57785
---- apache2.orig/server/util_script.c
-+++ apache2/server/util_script.c
-@@ -282,25 +282,12 @@ AP_DECLARE(void) ap_add_common_vars(requ
-     /* Apache custom error responses. If we have redirected set two new vars */
- 
-     if (r->prev) {
--        /* PR#57785: reconstruct full URL here */
--        apr_uri_t *uri = &r->prev->parsed_uri;
--        if (!uri->scheme) {
--            uri->scheme = (char*)ap_http_scheme(r->prev);
--        }
--        if (!uri->port) {
--            uri->port = ap_get_server_port(r->prev);
--            uri->port_str = apr_psprintf(r->pool, "%u", uri->port);
--        }
--        if (!uri->hostname) {
--            uri->hostname = (char*)ap_get_server_name_for_url(r->prev);
--        }
-         add_unless_null(e, "REDIRECT_QUERY_STRING", r->prev->args);
--        add_unless_null(e, "REDIRECT_URL",
--                        apr_uri_unparse(r->pool, uri, 0));
-+        add_unless_null(e, "REDIRECT_URL", r->prev->uri);
-     }
- 
-     if (e != r->subprocess_env) {
--        apr_table_overlap(r->subprocess_env, e, APR_OVERLAP_TABLES_SET);
-+      apr_table_overlap(r->subprocess_env, e, APR_OVERLAP_TABLES_SET);
-     }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6412656..b139c0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,4 @@ reproducible_builds.diff
 
 # This patch is applied manually
 #suexec-custom.patch
-revert-REDIRECT_URL.patch
-mod_http2_log_protocol.patch
 prefork_single_process_crash.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git