diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 17:01:16 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-09 17:01:16 +0000 |
| commit | d95fa1894447a1b5b96c482f4bb0290e9983636b (patch) | |
| tree | f3f5c5af88598d5c3ccfcec0dc88d089a7a14a42 /net/url_request/url_request_ftp_job.cc | |
| parent | c0553245c3c5548b52055ff353401fd82a4e0892 (diff) | |
| download | chromium_src-d95fa1894447a1b5b96c482f4bb0290e9983636b.zip chromium_src-d95fa1894447a1b5b96c482f4bb0290e9983636b.tar.gz chromium_src-d95fa1894447a1b5b96c482f4bb0290e9983636b.tar.bz2 | |
Check in patch for pierre.lafayette, http://codereview.chromium.org/178059/show.
Review URL: http://codereview.chromium.org/194057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_ftp_job.cc')
| -rw-r--r-- | net/url_request/url_request_ftp_job.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc index c7cb333..eca845a 100644 --- a/net/url_request/url_request_ftp_job.cc +++ b/net/url_request/url_request_ftp_job.cc @@ -62,8 +62,10 @@ URLRequestJob* URLRequestFtpJob::Factory(URLRequest* request, DCHECK(scheme == "ftp"); + int port = request->url().IntPort(); + if (request->url().has_port() && - !net::IsPortAllowedByFtp(request->url().IntPort())) + !net::IsPortAllowedByFtp(port) && !net::IsPortAllowedByOverride(port)) return new URLRequestErrorJob(request, net::ERR_UNSAFE_PORT); return new URLRequestFtpJob(request); |