------------------------------------------------------------ revno: 12630 revision-id: squid3@treenet.co.nz-20130929175451-4th2iq7fozn33jj1 parent: squid3@treenet.co.nz-20130929175016-2g2sivpi30hxd2ki fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3918 author: Alex Rousskov committer: Amos Jeffries branch nick: 3.3 timestamp: Sun 2013-09-29 11:54:51 -0600 message: Bug 3918: Squid 3.3.9 Self Test Failures on Mac OS X 10.8 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130929175451-4th2iq7fozn33jj1 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: ccc2c74cf8fa54726d9143a89af02efb2a258fe5 # timestamp: 2013-09-29 17:55:11 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130929175016-\ # 2g2sivpi30hxd2ki # # Begin patch === modified file 'src/tests/testHttpReply.cc' --- src/tests/testHttpReply.cc 2013-01-02 00:20:10 +0000 +++ src/tests/testHttpReply.cc 2013-09-29 17:54:51 +0000 @@ -194,7 +194,7 @@ error = HTTP_STATUS_NONE; // status line with nul-byte - input.append("HTTP/1.1\0200 Okay\n\n", 19); /* real case seen */ + input.append("HTTP/1.1" "\0" "200 Okay\n\n", 19); /* real case seen */ hdr_len = headersEnd(input.content(),input.contentSize()); CPPUNIT_ASSERT(!engine.sanityCheckStartLine(&input, hdr_len, &error) ); CPPUNIT_ASSERT_EQUAL(error, HTTP_INVALID_HEADER);