Hello community, here is the log from the commit of package squid3 for openSUSE:11.4 checked in at Thu May 26 18:42:38 CEST 2011.
/work/cd/bin/patchinfo_dirlist_cache: line 15: test: PATCHINFO/SWAMP-PROOFREAD-DONE/: binary operator expected -------- --- old-versions/11.4/all/squid3/squid3.changes 2011-02-13 18:17:23.000000000 +0100 +++ 11.4/squid3/squid3.changes 2011-05-16 22:27:27.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 16 20:23:31 UTC 2011 - ch...@computersalat.de + +- fix bnc#694120 - NONE/400 (null) under heavy load + o http://bugs.squid-cache.org/show_bug.cgi?id=2976 + #2976: invalid URL on intercepted requests during reconfigure + add squid-3.1-10236.patch + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/squid3 Destination is old-versions/11.4/UPDATES/all/squid3 calling whatdependson for 11.4-i586 New: ---- squid-3.1-10236.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid3.spec ++++++ --- /var/tmp/diff_new_pack.v7C0ER/_old 2011-05-26 18:40:22.000000000 +0200 +++ /var/tmp/diff_new_pack.v7C0ER/_new 2011-05-26 18:40:22.000000000 +0200 @@ -23,7 +23,7 @@ Name: squid3 Summary: Squid Version 3 WWW Proxy Server Version: 3.1.11 -Release: 1 +Release: 4.<RELEASE5> License: GPLv2+ Url: http://www.squid-cache.org/Versions/v3 Group: Productivity/Networking/Web/Proxy @@ -52,6 +52,8 @@ # or just visit: http://www.squid-cache.org/Versions/v3/3.0/changesets/ # #Patch0: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9107.patch +# FIX-UPSTREAM: Bug #2976: invalid URL on intercepted requests during reconfigure +Patch0: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-10236.patch # Patch100: squid-3.1.4-config.patch Patch101: squid-3.1.10-swapdir.patch @@ -101,7 +103,7 @@ %setup -q -n squid-%{version} %{__cp} %{S:11} . # upstream patches after RELEASE -#%patch0 -p0 +%patch0 -p0 ##### other patches %patch100 -p1 %if 0%{suse_version} > 1010 ++++++ squid-3.1-10236.patch ++++++ ------------------------------------------------------------ revno: 10236 revision-id: squ...@treenet.co.nz-20110322120426-c9s526a1h04bbsyb parent: squ...@treenet.co.nz-20110318124447-2ghmsj62b388oyfk fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=2976 committer: Amos Jeffries <squ...@treenet.co.nz> branch nick: SQUID_3_1 timestamp: Tue 2011-03-22 06:04:26 -0600 message: Bug 2976: invalid URL on intercepted requests during reconfigure Listening ports abuse the cbdata type as a pseudo refcount. This breaks during reconfigure when the config is erased and the active requests handles all become invalid pointers. Interception only works on HTTP protocol. We can hard-code the scheme and avoid this problem until a complete fix is written. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squ...@treenet.co.nz-20110322120426-c9s526a1h04bbsyb # target_branch: http://www.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 8b61111eebb394744e9f29b0cc61c0409cf1701a # timestamp: 2011-03-22 12:11:40 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_1 # base_revision_id: squ...@treenet.co.nz-20110318124447-\ # 2ghmsj62b388oyfk # # Begin patch === modified file 'src/client_side.cc' --- src/client_side.cc 2011-02-01 01:50:29 +0000 +++ src/client_side.cc 2011-03-22 12:04:26 +0000 @@ -1875,21 +1875,21 @@ return; /* already in good shape */ /* BUG: Squid cannot deal with '*' URLs (RFC2616 5.1.2) */ + // BUG 2976: Squid only accepts intercepted HTTP. if ((host = mime_get_header(req_hdr, "Host")) != NULL) { int url_sz = strlen(url) + 32 + Config.appendDomainLen + strlen(host); http->uri = (char *)xcalloc(url_sz, 1); - snprintf(http->uri, url_sz, "%s://%s%s", - conn->port->protocol, host, url); + snprintf(http->uri, url_sz, "http://%s%s";, /*conn->port->protocol,*/ host, url); debugs(33, 5, "TRANSPARENT HOST REWRITE: '" << http->uri <<"'"); } else { /* Put the local socket IP address as the hostname. */ int url_sz = strlen(url) + 32 + Config.appendDomainLen; http->uri = (char *)xcalloc(url_sz, 1); http->getConn()->me.ToHostname(ipbuf,MAX_IPSTRLEN), - snprintf(http->uri, url_sz, "%s://%s:%d%s", - http->getConn()->port->protocol, + snprintf(http->uri, url_sz, "http://%s:%d%s";, + // http->getConn()->port->protocol, ipbuf, http->getConn()->me.GetPort(), url); debugs(33, 5, "TRANSPARENT REWRITE: '" << http->uri << "'"); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
