rpms/lighttpd/devel lighttpd-1.4.19-ticket1774.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 lighttpd.spec, 1.46, 1.47 sources, 1.23, 1.24 lighttpd-1.4.19-sslshutdownfix.patch, 1.1, NONE

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14818

Modified Files:
	.cvsignore lighttpd.spec sources 
Added Files:
	lighttpd-1.4.19-ticket1774.patch 
Removed Files:
	lighttpd-1.4.19-sslshutdownfix.patch 
Log Message:
Update to 1.4.20 pre-release, normally the last one before the final, which includes security and bug fixes.


lighttpd-1.4.19-ticket1774.patch:

--- NEW FILE lighttpd-1.4.19-ticket1774.patch ---
Index: /branches/lighttpd-1.4.x/src/request.c
===================================================================
--- /branches/lighttpd-1.4.x/src/request.c (revision 1947)
+++ /branches/lighttpd-1.4.x/src/request.c (revision 2305)
@@ -826,4 +826,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -875,4 +876,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -912,4 +914,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -937,4 +940,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -954,4 +958,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}
@@ -977,4 +982,5 @@
 												con->request.request);
 									}
+									array_insert_unique(con->request.headers, (data_unset *)ds);
 									return 0;
 								}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	12 Mar 2008 09:43:57 -0000	1.23
+++ .cvsignore	23 Sep 2008 08:58:51 -0000	1.24
@@ -1 +1 @@
-lighttpd-1.4.19.tar.bz2
+lighttpd-1.4.20.prerelease.r2303.tar.bz2


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- lighttpd.spec	24 Apr 2008 15:17:17 -0000	1.46
+++ lighttpd.spec	23 Sep 2008 08:58:51 -0000	1.47
@@ -2,12 +2,13 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.19
-Release: 4%{?dist}
+Version: 1.4.20
+Release: 0.1.r2303%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
-Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
+#Source0: http://www.lighttpd.net/download/lighttpd-%{version}.tar.bz2
+Source0: http://opensu.se/~darix/lighttpd/lighttpd-1.4.20.prerelease.r2303.tar.bz2
 Source1: lighttpd.logrotate
 Source2: php.d-lighttpd.ini
 Source10: index.html
@@ -18,8 +19,8 @@
 Source101: lighttpd-mod_geoip.txt
 Patch0: lighttpd-1.4.17-defaultconf.patch
 Patch1: lighttpd-1.4.18-mod_geoip.patch
-# Security fixes
-Patch10: lighttpd-1.4.19-sslshutdownfix.patch
+# Security and bug fixes
+Patch10: lighttpd-1.4.19-ticket1774.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: system-logos >= 7.92.1
 Requires(pre): /usr/sbin/useradd
@@ -89,7 +90,7 @@
 %setup -q
 %patch0 -p1 -b .defaultconf
 %patch1 -p1 -b .mod_geoip
-%patch10 -p1 -b .sslshutdown
+%patch10 -p3 -b .memleak
 %{__install} -p -m 0644 %{SOURCE100} src/mod_geoip.c
 %{__install} -p -m 0644 %{SOURCE101} mod_geoip.txt
 
@@ -214,6 +215,12 @@
 
 
 %changelog
+* Mon Sep 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.20-0.1.r2303
+- Update to 1.4.20 r2303 pre-release.
+
+* Mon Sep 22 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-5
+- Include memory leak patch (changeset #2305 from ticket #1774).
+
 * Thu Apr 24 2008 Matthias Saou <http://freshrpms.net/> 1.4.19-4
 - Merge in second changest from upstream fix for upstream bug #285.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	12 Mar 2008 09:43:57 -0000	1.23
+++ sources	23 Sep 2008 08:58:51 -0000	1.24
@@ -1 +1 @@
-d787374e4e4aaa09d5cfa9ab9d23ad40  lighttpd-1.4.19.tar.bz2
+4fcf61a620909490c742b751fe8aa3b7  lighttpd-1.4.20.prerelease.r2303.tar.bz2


--- lighttpd-1.4.19-sslshutdownfix.patch DELETED ---