RE: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
On Wed, 29 Jul 2009 08:37:47 -0500, "Dean Weimer"
wrote:
>> -Original Message-
>> From: Amos Jeffries [mailto:squ...@treenet.co.nz]
>> Sent: Monday, July 27, 2009 10:01 AM
>> To: martin.pichlma...@continental-corporation.com
>> Cc: Squid
>> Subject: Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17
> is
>> available
>>
>> Amos Jeffries wrote:
>> > martin.pichlma...@continental-corporation.com wrote:
>> >> Hello all,
>> >>
>> >> I just compiled squid-3.0.STABLE17 and it compiled fine.
>> >> Unfortunately I now get many warning messages in cache.log (still
>> >> testing, not yet in productive environment):
>> >> 2009/07/27 15:11:26| HttpMsg.cc(157) first line of HTTP message is
>> >> invalid
>> >> 2009/07/27 15:11:28| HttpMsg.cc(157) first line of HTTP message is
>> >> invalid
>> >> 2009/07/27 15:11:37| HttpMsg.cc(157) first line of HTTP message is
>> >> invalid
>> >> 2009/07/27 15:11:40| HttpMsg.cc(157) first line of HTTP message is
>> >> invalid
>> >> 2009/07/27 15:11:41| HttpMsg.cc(157) first line of HTTP message is
>> >> invalid
>> >>
>> >> It seems that nearly every URL I try to access gives that warning
>> >> message,
>> >> for example www.arin.net, www.ripe.net, www.hp.com,
>> >> www.arin.net, even www.squid-cache.org and so on.
>> >> Are nearly all pages in the internet invalid or is the if-query or
>> >> rather the function incorrect?
>> >> The lines that produce the above warning are new in STABLE17...
>> >>
>> >> HttpMsg.cc -- lines 156 to 160:
>> >> if (!sanityCheckStartLine(buf, hdr_len, error)) {
>> >> debugs(58,1, HERE << "first line of HTTP message is
>> invalid");
>> >> // NP: sanityCheck sets *error
>> >> return false;
>> >> }
>> >>
>> >
>> > Oh dear. I missed a bit in the upgrade. Thanks.
>> > This attached patch should quieten it down to only the real errors.
>> >
>> > Amos
>> >
>>
>> Oh foey. forget that patch. It pasted badly.
>>
>> Here is the real one.
>>
>> Amos
>> --
>> Please be using
>>Current Stable Squid 2.7.STABLE6 or 3.0.STABLE17
>>Current Beta Squid 3.1.0.12
>
> Amos,
> Was this fixed on the 3.0.STABLE17 that's on the download site?
> Or do I still need to run this patch if I downloaded it today before
> installing it?
Todays snapshot you still have to patch. I don't have time for maintenance
until tomorrow.
Amos
RE: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
> -Original Message-
> From: Amos Jeffries [mailto:squ...@treenet.co.nz]
> Sent: Monday, July 27, 2009 10:01 AM
> To: martin.pichlma...@continental-corporation.com
> Cc: Squid
> Subject: Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17
is
> available
>
> Amos Jeffries wrote:
> > martin.pichlma...@continental-corporation.com wrote:
> >> Hello all,
> >>
> >> I just compiled squid-3.0.STABLE17 and it compiled fine.
> >> Unfortunately I now get many warning messages in cache.log (still
> >> testing, not yet in productive environment):
> >> 2009/07/27 15:11:26| HttpMsg.cc(157) first line of HTTP message is
> >> invalid
> >> 2009/07/27 15:11:28| HttpMsg.cc(157) first line of HTTP message is
> >> invalid
> >> 2009/07/27 15:11:37| HttpMsg.cc(157) first line of HTTP message is
> >> invalid
> >> 2009/07/27 15:11:40| HttpMsg.cc(157) first line of HTTP message is
> >> invalid
> >> 2009/07/27 15:11:41| HttpMsg.cc(157) first line of HTTP message is
> >> invalid
> >>
> >> It seems that nearly every URL I try to access gives that warning
> >> message,
> >> for example www.arin.net, www.ripe.net, www.hp.com,
> >> www.arin.net, even www.squid-cache.org and so on.
> >> Are nearly all pages in the internet invalid or is the if-query or
> >> rather the function incorrect?
> >> The lines that produce the above warning are new in STABLE17...
> >>
> >> HttpMsg.cc -- lines 156 to 160:
> >> if (!sanityCheckStartLine(buf, hdr_len, error)) {
> >> debugs(58,1, HERE << "first line of HTTP message is
> invalid");
> >> // NP: sanityCheck sets *error
> >> return false;
> >> }
> >>
> >
> > Oh dear. I missed a bit in the upgrade. Thanks.
> > This attached patch should quieten it down to only the real errors.
> >
> > Amos
> >
>
> Oh foey. forget that patch. It pasted badly.
>
> Here is the real one.
>
> Amos
> --
> Please be using
>Current Stable Squid 2.7.STABLE6 or 3.0.STABLE17
>Current Beta Squid 3.1.0.12
Amos,
Was this fixed on the 3.0.STABLE17 that's on the download site?
Or do I still need to run this patch if I downloaded it today before
installing it?
Re: [squid-users] Re: Antwort: Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
On Tue, 28 Jul 2009 11:54:29 -0700, George Herbert
wrote:
> Cool. Is there going to be a STABLE17A or something, or do we have to
> hand-patch for now?
The next formally bundled will be STABLE18. However the daily snapshots
serve as intermediate updates on STABLE
(http://www.squid-cache.org/Versions/v3/3.0/).
I just have not yet had time to apply these fixes to the branch yet.
Amos
>
> Thanks!
>
> On Tue, Jul 28, 2009 at 12:41 AM, Amos Jeffries
> wrote:
>> martin.pichlma...@continental-corporation.com wrote:
>>>
>>> Thank you Amos,
>>>
>>> your patch did the trick, it now works smoothly.
>>> I didn't have time to test yesterday, therefore sorry for my late
>>> response.
>>>
>>> Martin
>>>
>>>
>>>
>>>
>>> Amos Jeffries 27.07.2009 17:00
>>>
>>> An
>>> martin.pichlma...@continental-corporation.com
>>> Kopie
>>> Squid
>>> Thema
>>> Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is
available
>>>
>>>
>>>
>>>
>>>
>>>
>>> Amos Jeffries wrote:
>>>>
>>>> martin.pichlma...@continental-corporation.com wrote:
>>>>>
>>>>> Hello all,
>>>>>
>>>>> I just compiled squid-3.0.STABLE17 and it compiled fine.
>>>>> Unfortunately I now get many warning messages in cache.log (still
>>>>> testing, not yet in productive environment):
>>>>> 2009/07/27 15:11:26| HttpMsg.cc(157) first line of HTTP message is
>>>>> invalid
>>>>> 2009/07/27 15:11:28| HttpMsg.cc(157) first line of HTTP message is
>>>>> invalid
>>>>> 2009/07/27 15:11:37| HttpMsg.cc(157) first line of HTTP message is
>>>>> invalid
>>>>> 2009/07/27 15:11:40| HttpMsg.cc(157) first line of HTTP message is
>>>>> invalid
>>>>> 2009/07/27 15:11:41| HttpMsg.cc(157) first line of HTTP message is
>>>>> invalid
>>>>>
>>>>> It seems that nearly every URL I try to access gives that warning
>>>>> message,
>>>>> for example www.arin.net, www.ripe.net, www.hp.com,
>>>>> www.arin.net, even www.squid-cache.org and so on.
>>>>> Are nearly all pages in the internet invalid or is the if-query or
>>>>> rather the function incorrect?
>>>>> The lines that produce the above warning are new in STABLE17...
>>>>>
>>>>> HttpMsg.cc -- lines 156 to 160:
>>>>>if (!sanityCheckStartLine(buf, hdr_len, error)) {
>>>>>debugs(58,1, HERE << "first line of HTTP message is
>>>>> invalid");
>>>>>// NP: sanityCheck sets *error
>>>>>return false;
>>>>>}
>>>>>
>>>> Oh dear. I missed a bit in the upgrade. Thanks.
>>>> This attached patch should quieten it down to only the real errors.
>>>>
>>>> Amos
>>>>
>>>
>>> Oh foey. forget that patch. It pasted badly.
>>>
>>> Here is the real one.
>>>
>>> Amos
>>
>> Thank you very much for the feedback.
>>
>> If you noticed, the pconn complaint others made earlier slipped into
that
>> patch too. :)
>>
>>
>> Amos
>> --
>> Please be using
>> Current Stable Squid 2.7.STABLE6 or 3.0.STABLE17
>> Current Beta Squid 3.1.0.12
>>
Re: [squid-users] Re: Antwort: Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
Cool. Is there going to be a STABLE17A or something, or do we have to
hand-patch for now?
Thanks!
On Tue, Jul 28, 2009 at 12:41 AM, Amos Jeffries wrote:
> martin.pichlma...@continental-corporation.com wrote:
>>
>> Thank you Amos,
>>
>> your patch did the trick, it now works smoothly.
>> I didn't have time to test yesterday, therefore sorry for my late
>> response.
>>
>> Martin
>>
>>
>>
>>
>> Amos Jeffries 27.07.2009 17:00
>>
>> An
>> martin.pichlma...@continental-corporation.com
>> Kopie
>> Squid
>> Thema
>> Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
>>
>>
>>
>>
>>
>>
>> Amos Jeffries wrote:
>>>
>>> martin.pichlma...@continental-corporation.com wrote:
>>>>
>>>> Hello all,
>>>>
>>>> I just compiled squid-3.0.STABLE17 and it compiled fine.
>>>> Unfortunately I now get many warning messages in cache.log (still
>>>> testing, not yet in productive environment):
>>>> 2009/07/27 15:11:26| HttpMsg.cc(157) first line of HTTP message is
>>>> invalid
>>>> 2009/07/27 15:11:28| HttpMsg.cc(157) first line of HTTP message is
>>>> invalid
>>>> 2009/07/27 15:11:37| HttpMsg.cc(157) first line of HTTP message is
>>>> invalid
>>>> 2009/07/27 15:11:40| HttpMsg.cc(157) first line of HTTP message is
>>>> invalid
>>>> 2009/07/27 15:11:41| HttpMsg.cc(157) first line of HTTP message is
>>>> invalid
>>>>
>>>> It seems that nearly every URL I try to access gives that warning
>>>> message,
>>>> for example www.arin.net, www.ripe.net, www.hp.com,
>>>> www.arin.net, even www.squid-cache.org and so on.
>>>> Are nearly all pages in the internet invalid or is the if-query or
>>>> rather the function incorrect?
>>>> The lines that produce the above warning are new in STABLE17...
>>>>
>>>> HttpMsg.cc -- lines 156 to 160:
>>>> if (!sanityCheckStartLine(buf, hdr_len, error)) {
>>>> debugs(58,1, HERE << "first line of HTTP message is invalid");
>>>> // NP: sanityCheck sets *error
>>>> return false;
>>>> }
>>>>
>>> Oh dear. I missed a bit in the upgrade. Thanks.
>>> This attached patch should quieten it down to only the real errors.
>>>
>>> Amos
>>>
>>
>> Oh foey. forget that patch. It pasted badly.
>>
>> Here is the real one.
>>
>> Amos
>
> Thank you very much for the feedback.
>
> If you noticed, the pconn complaint others made earlier slipped into that
> patch too. :)
>
>
> Amos
> --
> Please be using
> Current Stable Squid 2.7.STABLE6 or 3.0.STABLE17
> Current Beta Squid 3.1.0.12
>
--
-george william herbert
george.herb...@gmail.com
[squid-users] Re: Antwort: Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
martin.pichlma...@continental-corporation.com wrote:
Thank you Amos,
your patch did the trick, it now works smoothly.
I didn't have time to test yesterday, therefore sorry for my late
response.
Martin
Amos Jeffries
27.07.2009 17:00
An
martin.pichlma...@continental-corporation.com
Kopie
Squid
Thema
Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
Amos Jeffries wrote:
martin.pichlma...@continental-corporation.com wrote:
Hello all,
I just compiled squid-3.0.STABLE17 and it compiled fine.
Unfortunately I now get many warning messages in cache.log (still
testing, not yet in productive environment):
2009/07/27 15:11:26| HttpMsg.cc(157) first line of HTTP message is
invalid
2009/07/27 15:11:28| HttpMsg.cc(157) first line of HTTP message is
invalid
2009/07/27 15:11:37| HttpMsg.cc(157) first line of HTTP message is
invalid
2009/07/27 15:11:40| HttpMsg.cc(157) first line of HTTP message is
invalid
2009/07/27 15:11:41| HttpMsg.cc(157) first line of HTTP message is
invalid
It seems that nearly every URL I try to access gives that warning
message,
for example www.arin.net, www.ripe.net, www.hp.com,
www.arin.net, even www.squid-cache.org and so on.
Are nearly all pages in the internet invalid or is the if-query or
rather the function incorrect?
The lines that produce the above warning are new in STABLE17...
HttpMsg.cc -- lines 156 to 160:
if (!sanityCheckStartLine(buf, hdr_len, error)) {
debugs(58,1, HERE << "first line of HTTP message is invalid");
// NP: sanityCheck sets *error
return false;
}
Oh dear. I missed a bit in the upgrade. Thanks.
This attached patch should quieten it down to only the real errors.
Amos
Oh foey. forget that patch. It pasted badly.
Here is the real one.
Amos
Thank you very much for the feedback.
If you noticed, the pconn complaint others made earlier slipped into
that patch too. :)
Amos
--
Please be using
Current Stable Squid 2.7.STABLE6 or 3.0.STABLE17
Current Beta Squid 3.1.0.12
[squid-users] Antwort: Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
Thank you Amos,
your patch did the trick, it now works smoothly.
I didn't have time to test yesterday, therefore sorry for my late
response.
Martin
Amos Jeffries
27.07.2009 17:00
An
martin.pichlma...@continental-corporation.com
Kopie
Squid
Thema
Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
Amos Jeffries wrote:
> martin.pichlma...@continental-corporation.com wrote:
>> Hello all,
>>
>> I just compiled squid-3.0.STABLE17 and it compiled fine.
>> Unfortunately I now get many warning messages in cache.log (still
>> testing, not yet in productive environment):
>> 2009/07/27 15:11:26| HttpMsg.cc(157) first line of HTTP message is
>> invalid
>> 2009/07/27 15:11:28| HttpMsg.cc(157) first line of HTTP message is
>> invalid
>> 2009/07/27 15:11:37| HttpMsg.cc(157) first line of HTTP message is
>> invalid
>> 2009/07/27 15:11:40| HttpMsg.cc(157) first line of HTTP message is
>> invalid
>> 2009/07/27 15:11:41| HttpMsg.cc(157) first line of HTTP message is
>> invalid
>>
>> It seems that nearly every URL I try to access gives that warning
>> message,
>> for example www.arin.net, www.ripe.net, www.hp.com,
>> www.arin.net, even www.squid-cache.org and so on.
>> Are nearly all pages in the internet invalid or is the if-query or
>> rather the function incorrect?
>> The lines that produce the above warning are new in STABLE17...
>>
>> HttpMsg.cc -- lines 156 to 160:
>> if (!sanityCheckStartLine(buf, hdr_len, error)) {
>> debugs(58,1, HERE << "first line of HTTP message is invalid");
>> // NP: sanityCheck sets *error
>> return false;
>> }
>>
>
> Oh dear. I missed a bit in the upgrade. Thanks.
> This attached patch should quieten it down to only the real errors.
>
> Amos
>
Oh foey. forget that patch. It pasted badly.
Here is the real one.
Amos
--
Please be using
Current Stable Squid 2.7.STABLE6 or 3.0.STABLE17
Current Beta Squid 3.1.0.12
=== modified file 'src/HttpMsg.cc'
--- src/HttpMsg.cc 2009-07-26 11:33:16 +
+++ src/HttpMsg.cc 2009-07-27 13:55:53 +
@@ -154,8 +154,7 @@
// sanity check the start line to see if this is in fact an HTTP
message
if (!sanityCheckStartLine(buf, hdr_len, error)) {
-debugs(58,1, HERE << "first line of HTTP message is invalid");
-// NP: sanityCheck sets *error
+// NP: sanityCheck sets *error and sends debug warnings.
return false;
}
=== modified file 'src/HttpReply.cc'
--- src/HttpReply.cc 2009-07-26 12:04:45 +
+++ src/HttpReply.cc 2009-07-27 14:59:48 +
@@ -446,8 +446,10 @@
// content is long enough to possibly hold a reply
// 4 being magic size of a 3-digit number plus space delimiter
if ( buf->contentSize() < (protoPrefix.size() + 4) ) {
-if (hdr_len > 0)
+if (hdr_len > 0) {
+debugs(58, 3, "HttpReply::sanityCheckStartLine: Too small
reply header (" << hdr_len << " bytes)");
*error = HTTP_INVALID_HEADER;
+}
return false;
}
=== modified file 'src/HttpRequest.cc'
--- src/HttpRequest.cc 2009-07-26 11:33:16 +
+++ src/HttpRequest.cc 2009-07-27 14:59:29 +
@@ -156,6 +156,7 @@
if ( buf->contentSize() < 2 ) {
// this is ony a real error if the headers apparently complete.
if (hdr_len > 0) {
+debugs(58, 3, "HttpRequest::sanityCheckStartLine: Too small
request header (" << hdr_len << " bytes)");
*error = HTTP_INVALID_HEADER;
}
return false;
=== modified file 'src/pconn.cc'
--- src/pconn.cc 2009-02-19 02:17:28 +
+++ src/pconn.cc 2009-07-27 08:04:11 +
@@ -188,7 +188,7 @@
else
snprintf(buf, SQUIDHOSTNAMELEN * 3 + 10, "%s:%d", host, (int)
port);
-debugs(48,6,"PconnPool::key(" << host << "," << port << "," << domain
<< "," << inet_ntoa(*client_address) << "is {" << buf << "}" );
+debugs(48,6,"PconnPool::key(" << (host?host:"") << "," << port << ","
<< (domain?domain:"") << "," <<
(client_address?inet_ntoa(*client_address):"") << "is {" << buf << "}" );
return buf;
}
Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
Amos Jeffries wrote:
martin.pichlma...@continental-corporation.com wrote:
Hello all,
I just compiled squid-3.0.STABLE17 and it compiled fine.
Unfortunately I now get many warning messages in cache.log (still
testing, not yet in productive environment):
2009/07/27 15:11:26| HttpMsg.cc(157) first line of HTTP message is
invalid
2009/07/27 15:11:28| HttpMsg.cc(157) first line of HTTP message is
invalid
2009/07/27 15:11:37| HttpMsg.cc(157) first line of HTTP message is
invalid
2009/07/27 15:11:40| HttpMsg.cc(157) first line of HTTP message is
invalid
2009/07/27 15:11:41| HttpMsg.cc(157) first line of HTTP message is
invalid
It seems that nearly every URL I try to access gives that warning
message,
for example www.arin.net, www.ripe.net, www.hp.com,
www.arin.net, even www.squid-cache.org and so on.
Are nearly all pages in the internet invalid or is the if-query or
rather the function incorrect?
The lines that produce the above warning are new in STABLE17...
HttpMsg.cc -- lines 156 to 160:
if (!sanityCheckStartLine(buf, hdr_len, error)) {
debugs(58,1, HERE << "first line of HTTP message is invalid");
// NP: sanityCheck sets *error
return false;
}
Oh dear. I missed a bit in the upgrade. Thanks.
This attached patch should quieten it down to only the real errors.
Amos
Oh foey. forget that patch. It pasted badly.
Here is the real one.
Amos
--
Please be using
Current Stable Squid 2.7.STABLE6 or 3.0.STABLE17
Current Beta Squid 3.1.0.12
=== modified file 'src/HttpMsg.cc'
--- src/HttpMsg.cc 2009-07-26 11:33:16 +
+++ src/HttpMsg.cc 2009-07-27 13:55:53 +
@@ -154,8 +154,7 @@
// sanity check the start line to see if this is in fact an HTTP message
if (!sanityCheckStartLine(buf, hdr_len, error)) {
-debugs(58,1, HERE << "first line of HTTP message is invalid");
-// NP: sanityCheck sets *error
+// NP: sanityCheck sets *error and sends debug warnings.
return false;
}
=== modified file 'src/HttpReply.cc'
--- src/HttpReply.cc 2009-07-26 12:04:45 +
+++ src/HttpReply.cc 2009-07-27 14:59:48 +
@@ -446,8 +446,10 @@
// content is long enough to possibly hold a reply
// 4 being magic size of a 3-digit number plus space delimiter
if ( buf->contentSize() < (protoPrefix.size() + 4) ) {
-if (hdr_len > 0)
+if (hdr_len > 0) {
+debugs(58, 3, "HttpReply::sanityCheckStartLine: Too small reply header (" << hdr_len << " bytes)");
*error = HTTP_INVALID_HEADER;
+}
return false;
}
=== modified file 'src/HttpRequest.cc'
--- src/HttpRequest.cc 2009-07-26 11:33:16 +
+++ src/HttpRequest.cc 2009-07-27 14:59:29 +
@@ -156,6 +156,7 @@
if ( buf->contentSize() < 2 ) {
// this is ony a real error if the headers apparently complete.
if (hdr_len > 0) {
+debugs(58, 3, "HttpRequest::sanityCheckStartLine: Too small request header (" << hdr_len << " bytes)");
*error = HTTP_INVALID_HEADER;
}
return false;
=== modified file 'src/pconn.cc'
--- src/pconn.cc 2009-02-19 02:17:28 +
+++ src/pconn.cc 2009-07-27 08:04:11 +
@@ -188,7 +188,7 @@
else
snprintf(buf, SQUIDHOSTNAMELEN * 3 + 10, "%s:%d", host, (int) port);
-debugs(48,6,"PconnPool::key(" << host << "," << port << "," << domain << "," << inet_ntoa(*client_address) << "is {" << buf << "}" );
+debugs(48,6,"PconnPool::key(" << (host?host:"") << "," << port << "," << (domain?domain:"") << "," << (client_address?inet_ntoa(*client_address):"") << "is {" << buf << "}" );
return buf;
}
Re: [squid-users] Antwort: [squid-users] Squid 3.0.STABLE17 is available
martin.pichlma...@continental-corporation.com wrote:
Hello all,
I just compiled squid-3.0.STABLE17 and it compiled fine.
Unfortunately I now get many warning messages in cache.log (still testing,
not yet in productive environment):
2009/07/27 15:11:26| HttpMsg.cc(157) first line of HTTP message is invalid
2009/07/27 15:11:28| HttpMsg.cc(157) first line of HTTP message is invalid
2009/07/27 15:11:37| HttpMsg.cc(157) first line of HTTP message is invalid
2009/07/27 15:11:40| HttpMsg.cc(157) first line of HTTP message is invalid
2009/07/27 15:11:41| HttpMsg.cc(157) first line of HTTP message is invalid
It seems that nearly every URL I try to access gives that warning message,
for example www.arin.net, www.ripe.net, www.hp.com,
www.arin.net, even www.squid-cache.org and so on.
Are nearly all pages in the internet invalid or is the if-query or rather
the function incorrect?
The lines that produce the above warning are new in STABLE17...
HttpMsg.cc -- lines 156 to 160:
if (!sanityCheckStartLine(buf, hdr_len, error)) {
debugs(58,1, HERE << "first line of HTTP message is invalid");
// NP: sanityCheck sets *error
return false;
}
Oh dear. I missed a bit in the upgrade. Thanks.
This attached patch should quieten it down to only the real errors.
Amos
--
Please be using
Current Stable Squid 2.7.STABLE6 or 3.0.STABLE16
Current Beta Squid 3.1.0.10 or 3.1.0.11
=== modified file 'src/HttpMsg.cc'
--- src/HttpMsg.cc 2009-07-26 11:33:16 +
+++ src/HttpMsg.cc 2009-07-27 13:55:53 +
@@ -154,8 +154,7 @@
// sanity check the start line to see if this is in fact an HTTP message
if (!sanityCheckStartLine(buf, hdr_len, error)) {
-debugs(58,1, HERE << "first line of HTTP message is invalid");
-// NP: sanityCheck sets *error
+// NP: sanityCheck sets *error and sends debug warnings.
return false;
}
=== modified file 'src/HttpReply.cc'
--- src/HttpReply.cc 2009-07-26 12:04:45 +
+++ src/HttpReply.cc 2009-07-27 14:01:49 +
@@ -446,8 +446,10 @@
// content is long enough to possibly hold a reply
// 4 being magic size of a 3-digit number plus space delimiter
if ( buf->contentSize() < (protoPrefix.size() + 4) ) {
-if (hdr_len > 0)
+if (hdr_len > 0) {
+debugs(58, 3, "HttpReply::sanityCheckStartLine: Too large reply header (" << hdr_len << " > " << Config.maxReplyHeaderSize <<")");
*error = HTTP_INVALID_HEADER;
+}
return false;
}
=== modified file 'src/HttpRequest.cc'
--- src/HttpRequest.cc 2009-07-26 11:33:16 +
+++ src/HttpRequest.cc 2009-07-27 14:02:36 +
@@ -156,6 +156,7 @@
if ( buf->contentSize() < 2 ) {
// this is ony a real error if the headers apparently complete.
if (hdr_len > 0) {
+debugs(58, 3, "HttpRequest::sanityCheckStartLine: debugs(58, 1, "HttpMsg::parse: Too large reply header (" << hdr_len << " > " << Config.maxReplyHeaderSize <<")");
*error = HTTP_INVALID_HEADER;
}
return false;
=== modified file 'src/pconn.cc'
--- src/pconn.cc 2009-02-19 02:17:28 +
+++ src/pconn.cc 2009-07-27 08:04:11 +
@@ -188,7 +188,7 @@
else
snprintf(buf, SQUIDHOSTNAMELEN * 3 + 10, "%s:%d", host, (int) port);
-debugs(48,6,"PconnPool::key(" << host << "," << port << "," << domain << "," << inet_ntoa(*client_address) << "is {" << buf << "}" );
+debugs(48,6,"PconnPool::key(" << (host?host:"") << "," << port << "," << (domain?domain:"") << "," << (client_address?inet_ntoa(*client_address):"") << "is {" << buf << "}" );
return buf;
}
