| Index: trunk/rpms/SOURCES/squid-2.5.STABLE13-nomanglerequestheaders.patch |
| — | — | @@ -0,0 +1,13 @@ |
| | 2 | +--- src/http.c.orig 2006-04-29 15:51:43.000000000 +0000 |
| | 3 | +@@ -1030,8 +1030,10 @@ |
| | 4 | + httpHeaderPutStr(hdr_out, HDR_CONNECTION, "keep-alive"); |
| | 5 | + } |
| | 6 | + } |
| | 7 | ++#if 0 |
| | 8 | + /* Now mangle the headers. */ |
| | 9 | + httpHdrMangleList(hdr_out, orig_request); |
| | 10 | ++#endif |
| | 11 | + stringClean(&strConnection); |
| | 12 | + } |
| | 13 | + |
| Index: trunk/rpms/SPECS/squid.spec |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | Summary: The Squid proxy caching server. |
| 7 | 7 | Name: squid |
| 8 | 8 | Version: 2.5.STABLE13 |
| 9 | | -Release: 4wm |
| | 9 | +Release: 5wm |
| 10 | 10 | Epoch: 7 |
| 11 | 11 | License: GPL |
| 12 | 12 | Group: System Environment/Daemons |
| — | — | @@ -36,6 +36,7 @@ |
| 37 | 37 | # Wikimedia patches |
| 38 | 38 | Patch251: squid-htcp-clr.diff |
| 39 | 39 | Patch252: squid-2.5.STABLE12RC1-errors.patch |
| | 40 | +Patch253: squid-2.5.STABLE13-nomanglerequestheaders.patch |
| 40 | 41 | |
| 41 | 42 | BuildRoot: %{_tmppath}/%{name}-%{version}-root |
| 42 | 43 | Prereq: /sbin/chkconfig logrotate shadow-utils |
| — | — | @@ -70,6 +71,7 @@ |
| 71 | 72 | %patch207 -p0 -b .htcp |
| 72 | 73 | %patch251 -p0 -b .htcpclr |
| 73 | 74 | %patch252 -p1 -b .errors |
| | 75 | +%patch253 -p0 -b .nomanglerequestheaders |
| 74 | 76 | |
| 75 | 77 | %build |
| 76 | 78 | export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; |
| — | — | @@ -108,7 +110,7 @@ |
| 109 | 111 | --enable-carp \ |
| 110 | 112 | --datadir=%{_datadir} |
| 111 | 113 | |
| 112 | | -export CFLAGS="-fPIE -Os -g -pipe -fsigned-char -DPURIFY=1" ; export LDFLAGS=-pie ; |
| | 114 | +export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; |
| 113 | 115 | make %{?_smp_mflags} |
| 114 | 116 | |
| 115 | 117 | mkdir faq |
| — | — | @@ -304,6 +306,10 @@ |
| 305 | 307 | chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true |
| 306 | 308 | |
| 307 | 309 | %changelog |
| | 310 | +* Sat Apr 29 2006 Mark Bergsma <mark@nedworks.org> 7:2.5.STABLE13-5.WM |
| | 311 | +- Include a patch that does not mangle headers using header_replace for |
| | 312 | + request headers generated by squid to origin servers |
| | 313 | + |
| 308 | 314 | * Thu Apr 27 2006 Mark Bergsma <mark@nedworks.org> 7:2.5.STABLE13-4.WM |
| 309 | 315 | - New production build with HTCP memleak fix |
| 310 | 316 | |