From 48a4ad5223a178062cb026280009f8de778d5f7aa255e194cedf1405354f201b Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 24 Sep 2018 13:54:25 +0000
Subject: [PATCH] Accepting request 637678 from home:stroeder:branches:Apache

updated to 2.4.35, successfully tested on Tumbleweed x86_64

OBS-URL: https://build.opensuse.org/request/show/637678
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=568
---
 apache2.changes          | 29 +++++++++++++++++++++++++++++
 apache2.spec             |  2 +-
 httpd-2.4.34.tar.bz2     |  3 ---
 httpd-2.4.34.tar.bz2.asc | 16 ----------------
 httpd-2.4.35.tar.bz2     |  3 +++
 httpd-2.4.35.tar.bz2.asc | 11 +++++++++++
 6 files changed, 44 insertions(+), 20 deletions(-)
 delete mode 100644 httpd-2.4.34.tar.bz2
 delete mode 100644 httpd-2.4.34.tar.bz2.asc
 create mode 100644 httpd-2.4.35.tar.bz2
 create mode 100644 httpd-2.4.35.tar.bz2.asc

diff --git a/apache2.changes b/apache2.changes
index 115faa9..3a2527f 100644
--- a/apache2.changes
+++ b/apache2.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Mon Sep 24 12:53:08 UTC 2018 - Michael Ströder <michael@stroeder.com>
+
+- updated to 2.4.35:
+  * http: Enforce consistently no response body with both 204 and 304
+    statuses.
+  * mod_status: Cumulate CPU time of exited child processes in the
+    "cu" and "cs" values. Add CPU time of the parent process to the
+    "c" and "s" values.
+  * mod_proxy: Improve the balancer member data shown in mod_status when
+    "ProxyStatus" is "On": add "busy" count and show byte counts in
+    auto mode always in units of kilobytes.
+  * mod_status: Add cumulated response duration time in milliseconds.
+  * mod_status: Complete the data shown for async MPMs in "auto" mode.
+    Added number of processes, number of stopping processes and number
+    of busy and idle workers.
+  * mod_ratelimit: Don't interfere with "chunked" encoding, fixing regression
+    introduced in 2.4.34.  PR 62568.
+  * mod_proxy: Remove load order and link dependency between mod_lbmethod_*
+    modules and mod_proxy. PR 62557.
+  * Allow the argument to <IfFile>, <IfDefine>, <IfSection>, <IfDirective>,
+    and <IfModule> to be quoted.  This is primarily for the benefit of
+    <IfFile>.
+  * mod_watchdog: Correct some log messages.
+  * mod_md: When the last domain name from an MD is moved to another one,
+    that now empty MD gets moved to the store archive. PR 62572.
+  * mod_ssl: Fix merging of SSLOCSPOverrideResponder.
+  * mod_proxy_balancer: Restore compatibility with APR 1.4.
+
 -------------------------------------------------------------------
 Mon Jul 16 12:03:39 UTC 2018 - pgajdos@suse.com
 
diff --git a/apache2.spec b/apache2.spec
index a1059f8..299de1c 100644
--- a/apache2.spec
+++ b/apache2.spec
@@ -69,7 +69,7 @@
 %define build_http2 0
 %endif
 Name:           apache2
-Version:        2.4.34
+Version:        2.4.35
 Release:        0
 Summary:        The Apache Web Server Version 2.4
 License:        Apache-2.0
diff --git a/httpd-2.4.34.tar.bz2 b/httpd-2.4.34.tar.bz2
deleted file mode 100644
index 82dbc26..0000000
--- a/httpd-2.4.34.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0
-size 6942969
diff --git a/httpd-2.4.34.tar.bz2.asc b/httpd-2.4.34.tar.bz2.asc
deleted file mode 100644
index 72d27bc..0000000
--- a/httpd-2.4.34.tar.bz2.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEqT1i7MPI6hLbIg7JNOp25nkUhagFAltEutIACgkQNOp25nkU
-haij3g/+LUZNmeOdnP1qG1jHII2gZO+47TtHYzAXflBJ7tG1bbmbsRfJrvnuTSKb
-/6buFczrK5++s+Q2IfQY8FW0Nudg51a+2w1jXJd53rmt+VSS8YP1dtu7dYDJTYXn
-fiau4Q1Q7M5rKE2HRar34ElpGhpdyGZY7hm8vkKi+mjmWAer1YitIlnmYOqgvvqu
-11SKmlZBGaayE+nFTjpmrrFP8o9bo2qvU/j9CKrbhxPhtFxmuX9/6sRgI59e51O5
-TPx/VsRfKaWoA/9Dxjm7c5EjRXPsB7X/OSLG0CYXMVNCVFoUxCtWbYulhELrSzb4
-0dbhv70zi/uS6hgEAgRCN0TeqL2zjocihEDmlc67ERtn3/ByB7N0WfF2wqO2KuWC
-tKr3LSUUobRFJZ/uB1n7wsT6/8J7m6UbaQQaEe2VtQTbIdsK8xjsfZxRSCMIGXco
-q2CwtsNREFf3t9fFPKJYet2M3AGtoq75mCljD1DKyAO3Pc8zmd0BtGg8ZtzjnaBl
-YvFKChTYlZCZe5HK2xY6RSfT6q62Gu75ze7CAhCJ9vu5Z2PrDK7k1v1rsFbOI4bd
-a7asCmOuoytjbENx/ArvnmNusG1JCASuBvqOYk3tB6mBEVVnJgGIO8Eyy1EEaYnL
-HmVNx/WipEQgJtuTvTLTCuMZTuZ1pAm4J72QjDx82ilP11+j0eY=
-=yJjl
------END PGP SIGNATURE-----
diff --git a/httpd-2.4.35.tar.bz2 b/httpd-2.4.35.tar.bz2
new file mode 100644
index 0000000..5ad11f9
--- /dev/null
+++ b/httpd-2.4.35.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56
+size 7044336
diff --git a/httpd-2.4.35.tar.bz2.asc b/httpd-2.4.35.tar.bz2.asc
new file mode 100644
index 0000000..b8e849c
--- /dev/null
+++ b/httpd-2.4.35.tar.bz2.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAABCAAGBQJboEzWAAoJEJleNSIa2E3/LmMIAKCFO1yVrGxJdGrgVXRBvPxw
+GI80mRN4xGdfMieptWffxI8dkEPUtnPOSpbR8OvLGc7AfR1X6kA29PuwKQSrnT44
+QCo1Nxtl8o88FdbyicJtTcZJ61bVMvEJRHWjMgOpXcxtyzHtIbutcJGr0bGDa7+H
+3j76hE4mxDbGqMOVBQ5/cBme8vSaruMhLrYc+DLK0aipnQ58+ydHO5NZM4j/mXvU
+W6Xl+Af3gmxdW9eh6a8d/UouwQKAymZzI3snGtBvMgU9x4EIaoDxbE4PUwoOuizg
+NWGPK2lIsGSikXustFxe0knFXcLJY1YYdGQVfRwdmy6+ryynn52MCMg9+XiqrSQ=
+=/iT3
+-----END PGP SIGNATURE-----