]> git.ipfire.org Git - thirdparty/squid.git/log
thirdparty/squid.git
11 years agoAdded MemBlob::appended() method. Handy during out-of-band buffer manipulation.
Alex Rousskov [Wed, 1 Jan 2014 20:11:16 +0000 (13:11 -0700)] 
Added MemBlob::appended() method. Handy during out-of-band buffer manipulation.

11 years agoMerged from trunk 13199.
Alex Rousskov [Wed, 1 Jan 2014 19:20:49 +0000 (12:20 -0700)] 
Merged from trunk 13199.

11 years agoRemoved stale copy-pasted boilerplate.
Alex Rousskov [Wed, 1 Jan 2014 17:51:10 +0000 (10:51 -0700)] 
Removed stale copy-pasted boilerplate.

11 years agoAdded missing stubs in testCharacterSet
Francesco Chemolli [Wed, 1 Jan 2014 17:15:10 +0000 (18:15 +0100)] 
Added missing stubs in testCharacterSet

11 years agoSourceFormat Enforcement
Alex Rousskov [Tue, 31 Dec 2013 18:49:41 +0000 (11:49 -0700)] 
SourceFormat Enforcement

11 years agoPolishing touches to address PREVIEW review concerns dated 2013/07/03.
Alex Rousskov [Tue, 31 Dec 2013 18:09:24 +0000 (11:09 -0700)] 
Polishing touches to address PREVIEW review concerns dated 2013/07/03.

11 years agoMake the Http1Parser::request_offets details private
Amos Jeffries [Tue, 31 Dec 2013 16:14:57 +0000 (08:14 -0800)] 
Make the Http1Parser::request_offets details private

11 years agoMake URI request-line field accessor for Http1Parser
Amos Jeffries [Tue, 31 Dec 2013 15:51:51 +0000 (07:51 -0800)] 
Make URI request-line field accessor for Http1Parser

Also, convert the client-side parseHttpRequest() sub-functions to make
use of it. Removing several strlen() and a memory allocation.

11 years agoConvert Http1Parser header block to SBuf storage
Amos Jeffries [Tue, 31 Dec 2013 14:33:43 +0000 (06:33 -0800)] 
Convert Http1Parser header block to SBuf storage

This does add a data copy for the mime headers block, but allows us to
consume data out of the underlying I/O buffer and parse the block into
SBuf cheaply.

Remove the now useless hdr_start, hdr_end, mimeHeaderBytes_ members.

11 years agoRename mime_get_header_field() as Http1Parser::getHeaderField()
Amos Jeffries [Tue, 31 Dec 2013 13:55:12 +0000 (05:55 -0800)] 
Rename mime_get_header_field() as Http1Parser::getHeaderField()

11 years agoFix tokenizer's Makefile.am
Francesco Chemolli [Tue, 31 Dec 2013 10:42:11 +0000 (11:42 +0100)] 
Fix tokenizer's Makefile.am

11 years agoMerged characterset branch
Francesco Chemolli [Tue, 31 Dec 2013 09:58:23 +0000 (10:58 +0100)] 
Merged characterset branch

11 years agoMerged from trunk
Francesco Chemolli [Tue, 31 Dec 2013 09:55:22 +0000 (10:55 +0100)] 
Merged from trunk

11 years agoDrop useless function mime_get_header()
Amos Jeffries [Tue, 31 Dec 2013 02:37:42 +0000 (18:37 -0800)] 
Drop useless function mime_get_header()

Also, drop the unused prefix parameter from mime_get_header_field().

11 years agoDo not use HERE in new or changed debugs() statements.
Alex Rousskov [Mon, 30 Dec 2013 23:58:33 +0000 (16:58 -0700)] 
Do not use HERE in new or changed debugs() statements.

Polished StoreEntry creation/destruction debugging.

11 years agoMerge from sbuf-tokenizer
Amos Jeffries [Mon, 30 Dec 2013 22:06:52 +0000 (14:06 -0800)] 
Merge from sbuf-tokenizer

11 years agoPolish debug of request header block
Amos Jeffries [Mon, 30 Dec 2013 22:04:08 +0000 (14:04 -0800)] 
Polish debug of request header block

11 years agoMake Http1Parser::parseRequestFirstLine() private and document
Amos Jeffries [Mon, 30 Dec 2013 21:22:56 +0000 (13:22 -0800)] 
Make Http1Parser::parseRequestFirstLine() private and document

Also shuffle the prefix garbage tolerance processing to a separate method
skipGarbageLines() and document the intended operations (it is currently
non-conformant with RFC 2616).

11 years agoShuffle request headersEnd call into Http1Parser::parseRequest actions
Amos Jeffries [Mon, 30 Dec 2013 18:18:03 +0000 (10:18 -0800)] 
Shuffle request headersEnd call into Http1Parser::parseRequest actions

Http1Parser will now respond with signals for 'incomplete parse' until
the entire first line and any mime headers are present. The size and
content of mime headers are guaranteed once the parser responds with a
true result.

HTTP/0.9, HTTP/1.* and future versions using "HTTP/" are all accounted for
and handled in accordance with HTTP RFC 2616 requirements (adjusted for
later HTTPbis WG clarifications).

TODO: Parsing of the mime header fields.

11 years agoReverted multi-ranges as they require c++0x initializers
Francesco Chemolli [Mon, 30 Dec 2013 13:22:05 +0000 (14:22 +0100)] 
Reverted multi-ranges as they require c++0x initializers

11 years agoPrep for 3.4.2
Amos Jeffries [Mon, 30 Dec 2013 10:48:15 +0000 (03:48 -0700)] 
Prep for 3.4.2

11 years agoFix CharacterSet ranged constructor
Francesco Chemolli [Mon, 30 Dec 2013 09:57:55 +0000 (10:57 +0100)] 
Fix CharacterSet ranged constructor

11 years agomore predefined charactersets
Francesco Chemolli [Mon, 30 Dec 2013 09:44:52 +0000 (10:44 +0100)] 
more predefined charactersets

11 years agoAdded ability to manage ranges to CharacterSet
Francesco Chemolli [Mon, 30 Dec 2013 07:05:21 +0000 (08:05 +0100)] 
Added ability to manage ranges to CharacterSet

11 years agoImplemented CharacterSet's operator + and addRange, fixed bug in interface of operato...
Francesco Chemolli [Sun, 29 Dec 2013 22:59:39 +0000 (23:59 +0100)] 
Implemented CharacterSet's operator + and addRange, fixed bug in interface of operator+=, added some common CharacterSets, initial unit tests

11 years agoMerged from trunk
Francesco Chemolli [Sun, 29 Dec 2013 21:48:26 +0000 (22:48 +0100)] 
Merged from trunk

11 years agoMerged from trunk
Francesco Chemolli [Sun, 29 Dec 2013 16:40:22 +0000 (17:40 +0100)] 
Merged from trunk

11 years agoBug 3498: FTP PUT assertion Server.cc:246: "r->body_pipe != NULL"
Alex Rousskov [Sun, 29 Dec 2013 15:56:02 +0000 (07:56 -0800)] 
Bug 3498: FTP PUT assertion Server.cc:246: "r->body_pipe != NULL"

11 years agoMade test-builds.sh happy by adding missing stubs and adjusting existing ones.
Alex Rousskov [Sun, 29 Dec 2013 05:30:26 +0000 (22:30 -0700)] 
Made test-builds.sh happy by adding missing stubs and adjusting existing ones.

11 years agoMake HttpParser parse method directly into HttpRequestMethod object
Amos Jeffries [Sat, 28 Dec 2013 01:03:29 +0000 (17:03 -0800)] 
Make HttpParser parse method directly into HttpRequestMethod object

There appears to be no need for the HTTP method object to be outside
the parser. We can simplify the processing code by parsing directly into
the object from the I/O buffer.

TODO:
* fix parsing of whitespace prefix in accordance with HTTPbis specs.
* make parser incremental to end of method

11 years agoUpdated tests/testRock and the store rebuild stubs it needs.
Alex Rousskov [Fri, 27 Dec 2013 18:37:26 +0000 (11:37 -0700)] 
Updated tests/testRock and the store rebuild stubs it needs.
Synced tests/testUfs after updating the store rebuild stubs.

Store uses StoreController::store_dirs_rebuilding to decide whether the entry
release should be delayed. Thus, storeRebuildComplete() must update it. Also
synced the corresponding CPPUNIT_ASSERT_EQUAL() statements to expect a zero
value after the rebuild is completed.

Do not create an entry just to get its key: Creating forces a public key which
necessarily invalidates the previously cached entry with the same key, if any.

Unlock unused entries. This helps with their release later (and adds more
realism to the test case).

Fixed entry #5 test case to account for the fact that creating a second entry
with the same public key invalidates the first entry.

Release instead of just unlinking entries. StoreEntry::release() is the public
interface which updates internal tables as needed. StoreEntry::unlink() is an
internal call for updating the disk cache-related state; it does not update
the the in-transit index.

11 years agoCheck that StoreEntry lock does not go negative
Alex Rousskov [Fri, 27 Dec 2013 18:34:41 +0000 (11:34 -0700)] 
Check that StoreEntry lock does not go negative
which may happen if unlocked (and possibly deleted) entry is unlocked (again).

11 years agoFix typo in client_side.cc parser result handling
Amos Jeffries [Fri, 27 Dec 2013 12:44:19 +0000 (04:44 -0800)] 
Fix typo in client_side.cc parser result handling

11 years agoShuffle HttpRequestMethod.h to libsquid-http.la
Amos Jeffries [Mon, 23 Dec 2013 17:26:50 +0000 (09:26 -0800)] 
Shuffle HttpRequestMethod.h to libsquid-http.la

11 years agoAdd support for FTP MLSD and MLST commands (RFC 3659)
Christos Tsantilas [Mon, 23 Dec 2013 16:42:45 +0000 (18:42 +0200)] 
Add support for FTP MLSD and MLST commands (RFC 3659)

FileZilla is a popular FTP clients supporting that command (via FEAT detection).
It will use MLSD instead of LIST if the server claims support for MLST and/or
MLSD command.

11 years agoAdd missing http/forward.h
Amos Jeffries [Mon, 23 Dec 2013 16:23:04 +0000 (08:23 -0800)] 
Add missing http/forward.h

11 years agoCleanup HttpRequestMethod.h useless lines
Amos Jeffries [Mon, 23 Dec 2013 12:37:21 +0000 (04:37 -0800)] 
Cleanup HttpRequestMethod.h useless lines

11 years agoFix http/Http1Parser.h wrapper macro
Amos Jeffries [Mon, 23 Dec 2013 12:21:56 +0000 (04:21 -0800)] 
Fix http/Http1Parser.h wrapper macro

11 years agoMerged from trunk rev.13197
Amos Jeffries [Mon, 23 Dec 2013 12:18:49 +0000 (04:18 -0800)] 
Merged from trunk rev.13197

11 years agoRename HttpParser as Http::Http1Parser
Amos Jeffries [Mon, 23 Dec 2013 12:16:33 +0000 (04:16 -0800)] 
Rename HttpParser as Http::Http1Parser

11 years agoMake HttpParser parse version directly into AnyP::ProtocolVersion object
Amos Jeffries [Mon, 23 Dec 2013 11:21:48 +0000 (03:21 -0800)] 
Make HttpParser parse version directly into AnyP::ProtocolVersion object

There appears to be no need for the protocol version object to be outside
the parser. We can simplify the processing code by parsing directly into
the object from the I/O buffer.

TODO: allow parsing of non-HTTP protocol labels.

11 years agoBug 3806: Caching responses with Vary header
Alex Rousskov [Mon, 23 Dec 2013 05:26:23 +0000 (22:26 -0700)] 
Bug 3806: Caching responses with Vary header

Various fixes making Vary caching work better.
More work is needed to re-enable shared memory caching of Vary responses.

bag5s r12741: Do not start storing the vary marker object until its key becomes public.
bag5s r12742: Log failed (due to "Vary object loop" or "URL mismatch") hits as TCP_MISSes.
bag5s r12743: Refuse to cache Vary-controlled objects in shared memory (for now).

Based on trunk r13179.

11 years agoShuffle HttpParser to libsquid-http as Http1Parser
Amos Jeffries [Sun, 22 Dec 2013 22:40:03 +0000 (14:40 -0800)] 
Shuffle HttpParser to libsquid-http as Http1Parser

11 years agoDrop HttpParser::Pointer::getRaw() uses
Amos Jeffries [Sun, 22 Dec 2013 21:45:45 +0000 (13:45 -0800)] 
Drop HttpParser::Pointer::getRaw() uses

11 years agoDetatch useless build dependencies on HttpParser.h
Amos Jeffries [Sun, 22 Dec 2013 21:14:55 +0000 (13:14 -0800)] 
Detatch useless build dependencies on HttpParser.h

11 years agoConvert API of HttpParser::parseRequest() from tristate to boolean
Amos Jeffries [Sun, 22 Dec 2013 20:53:25 +0000 (12:53 -0800)] 
Convert API of HttpParser::parseRequest() from tristate to boolean

11 years agoMove HttpParserParseReqLine() legacy function to HttpParser method
Amos Jeffries [Sun, 22 Dec 2013 18:19:19 +0000 (10:19 -0800)] 
Move HttpParserParseReqLine() legacy function to HttpParser method

11 years agoInline and document the HTTP message size macros
Amos Jeffries [Sun, 22 Dec 2013 16:21:04 +0000 (08:21 -0800)] 
Inline and document the HTTP message size macros

11 years agoDrop HttpParser MSGDODEBUG
Amos Jeffries [Sun, 22 Dec 2013 13:20:01 +0000 (05:20 -0800)] 
Drop HttpParser MSGDODEBUG

11 years agoDocumentation tweak
Amos Jeffries [Sun, 22 Dec 2013 13:17:29 +0000 (05:17 -0800)] 
Documentation tweak

11 years agoBug 3985: 60s limit introduced by balance_on_multiple_ip breaks bad IP recovery
Jakob Bohm [Sat, 21 Dec 2013 17:31:59 +0000 (09:31 -0800)] 
Bug 3985: 60s limit introduced by balance_on_multiple_ip breaks bad IP recovery

Alternative fix if necessary would be to calculate a dynamic timeout
value based on number and timeouts for connections and forwarding.

However, as noted in the bug report the address markings are reset every
TTL when the stored RR are replaced. This meets the criteria for periodic
retries of marked-BAD IPs. Also if all IPs are marked BAD they all get
un-marked and retried. So for now just remove the TTL hack.

11 years agoFix \-unescaping in quoted strings from helpers
Amos Jeffries [Sat, 21 Dec 2013 04:54:54 +0000 (20:54 -0800)] 
Fix \-unescaping in quoted strings from helpers

strwordtok() was unescaping '\' values in unquoted tokens. This causes
problems with NTLM helper response user\DOMAIN values which are sent as
a un-quoted un-escaped value.

Restrict un-escaping of '\' to only occur when inside "quoted" words.

11 years agoWCCPv2: fix assertion 'Cannot convert non-IPv4 to IPv4' on FreeBSD
Amos Jeffries [Fri, 20 Dec 2013 11:34:44 +0000 (03:34 -0800)] 
WCCPv2: fix assertion 'Cannot convert non-IPv4 to IPv4' on FreeBSD

FreeBSD does not set the from-address on recv() if there was an error
reading the packet. This can result in Ip::Address assertion if the
error is not checked for before the IP address is mapped into Squid
internal format.

11 years agoFix missing cast in rev.13162
Amos Jeffries [Fri, 20 Dec 2013 05:55:43 +0000 (22:55 -0700)] 
Fix missing cast in rev.13162

11 years agoMade "make check" happier by syncing test case with Store API changes
Alex Rousskov [Thu, 19 Dec 2013 23:13:24 +0000 (16:13 -0700)] 
Made "make check" happier by syncing test case with Store API changes
and making StoreEntry::hashDelete() more forgiving.

11 years agoRecognize FTP 125 (Data connection already open) as we do 150 response,
Christos Tsantilas [Thu, 19 Dec 2013 17:31:25 +0000 (10:31 -0700)] 
Recognize FTP 125 (Data connection already open) as we do 150 response,
now for the upload/STOR case (the download case was handled in ftp-gw r12789).

Microsoft servers seem to favor 125 responses in some conditions.

11 years agoAbsorb parser work from parser-ng
Francesco Chemolli [Thu, 19 Dec 2013 16:00:30 +0000 (17:00 +0100)] 
Absorb parser work from parser-ng

11 years agoMerged from trunk
Francesco Chemolli [Thu, 19 Dec 2013 15:55:52 +0000 (16:55 +0100)] 
Merged from trunk

11 years agoAdded missing header in client_side_reply.cc for clang
Francesco Chemolli [Thu, 19 Dec 2013 13:47:27 +0000 (14:47 +0100)] 
Added missing header in client_side_reply.cc for clang

11 years agoAdd missing StoreEntry::lock() parameters, require unlock() parameter,
Alex Rousskov [Thu, 19 Dec 2013 04:53:35 +0000 (21:53 -0700)] 
Add missing StoreEntry::lock() parameters, require unlock() parameter,
and polish un/lock() context debugging.

11 years agoFix missing include in rev.13190
Amos Jeffries [Thu, 19 Dec 2013 00:55:46 +0000 (17:55 -0700)] 
Fix missing include in rev.13190

11 years agoAdded StoreEntry::lock() call dropped when merging from trunk r13172.
Alex Rousskov [Wed, 18 Dec 2013 22:32:14 +0000 (15:32 -0700)] 
Added StoreEntry::lock() call dropped when merging from trunk r13172.

11 years agoRename SBuf::find_first_of and find_first_not_of to camelCase.
Francesco Chemolli [Wed, 18 Dec 2013 17:53:43 +0000 (18:53 +0100)] 
Rename SBuf::find_first_of and find_first_not_of to camelCase.

11 years agoAdded send_hit and store_miss squid.conf directives
Alex Rousskov [Wed, 18 Dec 2013 17:19:00 +0000 (10:19 -0700)] 
Added send_hit and store_miss squid.conf directives
to control caching of responses using response info.

The existing "cache" directive is checked before Squid has access to the
response and, hence, could not use response-based ACLs such as http_status.
Response-based ACLs may be essential when fine-tuning caching. Squid Bug 3937
(StoreID can lead to 302 infinite loop) is a good use case.

Updated old "cache" directive documentation to provide more information, to
help folks distinguish the three related directives, and to polish for
clarity.

TODO: Support lookup_hit and possibly deprecate/remove "cache".

11 years agoMerge CharacterSet
Francesco Chemolli [Wed, 18 Dec 2013 17:03:15 +0000 (18:03 +0100)] 
Merge CharacterSet

11 years agoReverted buggy change on CharacterSet::operator+=, documentation touches
Francesco Chemolli [Wed, 18 Dec 2013 15:22:06 +0000 (16:22 +0100)] 
Reverted buggy change on CharacterSet::operator+=, documentation touches

11 years agoMerged from trunk
Francesco Chemolli [Wed, 18 Dec 2013 14:07:05 +0000 (15:07 +0100)] 
Merged from trunk

11 years agoMerged from trunk
Amos Jeffries [Wed, 18 Dec 2013 06:19:15 +0000 (22:19 -0800)] 
Merged from trunk

11 years agoMerged from trunk
Francesco Chemolli [Wed, 18 Dec 2013 18:24:18 +0000 (19:24 +0100)] 
Merged from trunk

11 years agoMerged from trunk
Francesco Chemolli [Wed, 18 Dec 2013 18:06:43 +0000 (19:06 +0100)] 
Merged from trunk

11 years agoAdd unit tests for method parsing update
Amos Jeffries [Wed, 18 Dec 2013 03:00:01 +0000 (19:00 -0800)] 
Add unit tests for method parsing update

11 years agoFix missing include in rev.13186
Amos Jeffries [Wed, 18 Dec 2013 00:48:33 +0000 (16:48 -0800)] 
Fix missing include in rev.13186

11 years agoImproved CharacterSet documentation.
Francesco Chemolli [Tue, 17 Dec 2013 17:28:53 +0000 (18:28 +0100)] 
Improved CharacterSet documentation.

11 years agoMerged from trunk
Francesco Chemolli [Tue, 17 Dec 2013 17:05:17 +0000 (18:05 +0100)] 
Merged from trunk

11 years agoUsing std::copy_if for CharacterSet::operator +=
Francesco Chemolli [Tue, 17 Dec 2013 17:02:51 +0000 (18:02 +0100)] 
Using std::copy_if for CharacterSet::operator +=

11 years agoClarified documentatio for CharacterSet; moved CharacterSet::add and constructor...
Francesco Chemolli [Tue, 17 Dec 2013 15:58:52 +0000 (16:58 +0100)] 
Clarified documentatio for CharacterSet; moved CharacterSet::add and constructor to .cc file

11 years agoMove CharacterSet::operator += to .cc file; change SBuf::find_first_not_of to match STL
Francesco Chemolli [Tue, 17 Dec 2013 10:19:44 +0000 (11:19 +0100)] 
Move CharacterSet::operator += to .cc file; change SBuf::find_first_not_of to match STL

11 years agoHTTP/1.1: method names are case-sensitive
Amos Jeffries [Tue, 17 Dec 2013 09:16:51 +0000 (02:16 -0700)] 
HTTP/1.1: method names are case-sensitive

RFC 2616 states that method names are case sensitive, but the Squid
parser has been accepting them case-insensitive.

Enforce case-sensitive behaviour when performing strict HTTP parse.

NOTE: avoid HTTP_VIOLATIONS since there is no normative MUST/SHOULD
involved in the specification texts.

11 years agoBug 3980: FATAL ERROR due to max_user_ip -s option
Christos Tsantilas [Tue, 17 Dec 2013 07:12:55 +0000 (00:12 -0700)] 
Bug 3980: FATAL ERROR due to max_user_ip -s option

11 years agoMoved CharacterSet's backing storage to std::vector<uint8_t> to gain speed at the...
Francesco Chemolli [Mon, 16 Dec 2013 21:58:50 +0000 (22:58 +0100)] 
Moved CharacterSet's backing storage to std::vector<uint8_t> to gain speed at the expense of space.
Improved CharacterSet's constructor
Made CharacterSet's name parameter optional with default value.

11 years agoMoved CharacterSet as forward-declaration in SBuf.h
Francesco Chemolli [Sun, 15 Dec 2013 12:48:01 +0000 (13:48 +0100)] 
Moved CharacterSet as forward-declaration in SBuf.h

11 years agoImplemented CharacterSet-based SBuf::find_first_of and find_first_not_of
Francesco Chemolli [Sun, 15 Dec 2013 11:47:07 +0000 (12:47 +0100)] 
Implemented CharacterSet-based SBuf::find_first_of and find_first_not_of

11 years agoSilence SBufDetailedStats stubs
Francesco Chemolli [Sun, 15 Dec 2013 09:28:50 +0000 (10:28 +0100)] 
Silence SBufDetailedStats stubs

11 years agoMerge SBufList
Francesco Chemolli [Sun, 15 Dec 2013 09:28:18 +0000 (10:28 +0100)] 
Merge SBufList

11 years agoClarified comment in SBufAlgos.h, improved coding standards adherence
Francesco Chemolli [Sat, 14 Dec 2013 15:58:04 +0000 (16:58 +0100)] 
Clarified comment in SBufAlgos.h, improved coding standards adherence

11 years agoImplemented Tokenizer::token and its unit test
Francesco Chemolli [Fri, 13 Dec 2013 18:22:08 +0000 (19:22 +0100)] 
Implemented Tokenizer::token and its unit test

11 years agoUrls contain ipv6 ipaddresses may not logged correctly
Christos Tsantilas [Fri, 13 Dec 2013 18:05:59 +0000 (20:05 +0200)] 
Urls contain ipv6 ipaddresses may not logged correctly

The urls which include an ipv6 address as hostname does not logged correctly
in the following cases:
 - When a user is already logged in to an ftp server and a
   new USER command entered with ipv6 address as hostname the logged url
   does not put ipv6 address inside brackets ([]).
 - On FTP error responses generated by squid the url which includes ipv6
   addresses apearred with brackets urlencoded. eg:
         ftp://%5B::1%5D/

11 years agoImplemented more Tokenizer methods and unit tests
Francesco Chemolli [Fri, 13 Dec 2013 15:49:39 +0000 (16:49 +0100)] 
Implemented more Tokenizer methods and unit tests

11 years agoFixed initialization problem in testCharacterSet
Francesco Chemolli [Fri, 13 Dec 2013 07:16:18 +0000 (08:16 +0100)] 
Fixed initialization problem in testCharacterSet
Removed debug code in testTokenizer
Completed testTokenizerPrefix

11 years agoBroken: try and figure out CharacterSet::operator +=; more Tokenizer::prefix unit...
Francesco Chemolli [Fri, 13 Dec 2013 05:47:07 +0000 (06:47 +0100)] 
Broken: try and figure out CharacterSet::operator +=; more Tokenizer::prefix unit tests

11 years agoFtp server host does not reset when a new USER command given
Christos Tsantilas [Thu, 12 Dec 2013 18:27:34 +0000 (20:27 +0200)] 
Ftp server host does not reset when a new USER command given

11 years agoFix linker errors "relocation R_X86_64_32 against .rodata"
Amos Jeffries [Thu, 12 Dec 2013 09:41:39 +0000 (01:41 -0800)] 
Fix linker errors "relocation R_X86_64_32 against .rodata"

... "can not be used when making a shared object; recompile with -fPIC"

Caused by some libraries built without libtool in certain environments.
NP: there are other libraries in Squid built without libtool but they
    appear not to be having these linker issues at this time.

Also, fixes "undefined symbol eui64_aton" uncovered by these changes.

11 years agoFTP gw tracking of server directory
Christos Tsantilas [Wed, 11 Dec 2013 22:13:41 +0000 (00:13 +0200)] 
FTP gw tracking of server directory

This feature works as follows:
- Squid probes the remote directory by inserting PWD commands after the initial
  login and after every CWD command sent by the client.
- Squid remembers the current directory
- client-side generates the URL in pseudo HTTP requests from the domain name
  and the current directory (e.g. GET ftp://ftp.example.com/pub).
- For FTP commands with directories or file names as arguments (e.g. file
  donwload/upload, directory listing), these arguments are appended to the
  current directory (e.g. “RETR project/file.txt” becomes
  “GET ftp://ftp.example.com/pub/project/file.txt”;).

The feature can be controlled via a new ftp-track-dirs=[on|off] option for the
ftp_port squid.conf parameter.
Ftp server directory tracking is disabled by default.

11 years agoRegression in URL helper API
Amos Jeffries [Wed, 11 Dec 2013 11:12:43 +0000 (03:12 -0800)] 
Regression in URL helper API

The backward compatibility logics in redirect.cc are not working as
intended on redirection URLs due to the presence of '=' in the URL and
how the key=value name parsing is performed.

A typical redirection URL looks like:
  http://example.com/?url=http://www.example.net/

and 3.4 has a parser that splits tokens at '=' unconditionally and then
passes the bits as a key and value to the redirector logics which
complains that it does not understand the answer of the URL redirector.
Or treats is an an unknown key=value with no redirection URL.

Either case is handled as a no-redirection result from the helper.

This limits the key names to alphanumeric, hyphen and underscore
characters. Valid URL responses contain characters outside this set and
should no longer be interpreted as keys regardless of the '=' character.

11 years agoFix missing test stub in rev.13178
Amos Jeffries [Wed, 11 Dec 2013 23:41:49 +0000 (12:41 +1300)] 
Fix missing test stub in rev.13178

11 years agoBug 3806: Caching responses with Vary header
Alex Rousskov [Wed, 11 Dec 2013 22:44:59 +0000 (11:44 +1300)] 
Bug 3806: Caching responses with Vary header

11 years agoSet sslcrtvalidator_children concurrency option default value to 1
Christos Tsantilas [Wed, 11 Dec 2013 21:50:06 +0000 (23:50 +0200)] 
Set sslcrtvalidator_children concurrency option default value to 1

11 years agoMerged from trunk
Amos Jeffries [Wed, 11 Dec 2013 01:32:21 +0000 (17:32 -0800)] 
Merged from trunk

11 years agoFix infinite-loop in CharacterSet::operator+=()
Amos Jeffries [Wed, 11 Dec 2013 01:30:34 +0000 (17:30 -0800)] 
Fix infinite-loop in CharacterSet::operator+=()

The uint8_t type value cannot represent the value 256, which is why we
use it as the loop terminator and an iterator of a size larger than
8-bit with a down-cast to prevent the vector accidentally being grown by
an overflow.

11 years agoReimplemented prefix, implemented prefix matching unit test
Francesco Chemolli [Thu, 12 Dec 2013 23:12:29 +0000 (00:12 +0100)] 
Reimplemented prefix, implemented prefix matching unit test