- rel 2; fix for range fix regression; probably there will be 2.2.21 due to this

Changed files:
    apache-bug-51748.patch -> 1.1
    apache.spec -> 1.632

diff --git a/apache-bug-51748.patch b/apache-bug-51748.patch
new file mode 100644 (file)
index 0000000..3974ff0
--- /dev/null
+++ b/apache-bug-51748.patch
@@ -0,0 +1,11 @@
+--- httpd/httpd/trunk/modules/http/byterange_filter.c  2011/09/01 06:42:40     1163920
++++ httpd/httpd/trunk/modules/http/byterange_filter.c  2011/09/01 10:25:45     1163985
+@@ -544,7 +544,7 @@
+             return 0;
+         }
+ 
+-        if (dash == range) {
++        if (dash == cur) {
+             /* In the form "-5" */
+             if (apr_strtoff(&number, dash+1, &errp, 10) || *errp) {
+                 return 0;

diff --git a/apache.spec b/apache.spec
index 1f09dc857383f24951dff742b917f4bc8dca5dc2..306d5e8dad55540da5b27e075e821ff18dd82097 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -44,7 +44,7 @@ Summary(ru.UTF-8):    Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
 Version:       2.2.20
-Release:       1
+Release:       2
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -103,6 +103,7 @@ Patch26:    apache-mod_vhost_alias_docroot.patch
 # http://mpm-itk.sesse.net/
 Patch28:       apache-mpm-itk.patch
 Patch29:       libtool-tag.patch
+Patch30:       apache-bug-51748.patch
 URL:           http://httpd.apache.org/
 BuildRequires: apr-devel >= %{apr_ver}
 BuildRequires: apr-util-devel >= 1:1.3.10-2
@@ -1794,6 +1795,7 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch26 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p3
 
 # using system apr, apr-util and pcre
 %{__rm} -r srclib/{apr,apr-util,pcre}