Changeset 24484 in webkit
- Timestamp:
- Jul 20, 2007 11:37:09 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r24480 r24484 1 2007-07-20 Darin Adler <darin@apple.com> 2 3 Reviewed by John Sullivan. 4 5 - test for <rdar://problem/5331723> <rdar://problem/5331723> Safari gives error 6 103 for URLs that Adobe Lightroom's Preview feature produces, with ":1" in the hostname 7 8 * fast/loader/file-URL-with-port-number-expected.txt: Added. 9 * fast/loader/file-URL-with-port-number.html: Added. 10 * fast/loader/resources/empty-subframe.html: Added. 11 1 12 2007-07-20 Rob Buis <buis@kde.org> 2 13 -
trunk/WebCore/ChangeLog
r24481 r24484 1 2007-07-20 Darin Adler <darin@apple.com> 2 3 Reviewed by John Sullivan. 4 5 - fix for <rdar://problem/5331723> <rdar://problem/5331723> Safari gives error 6 103 for URLs that Adobe Lightroom's Preview feature produces, with ":1" in the hostname 7 8 Test: fast/loader/file-URL-with-port-number.html 9 10 * platform/network/ResourceHandle.cpp: (WebCore::ResourceHandle::portAllowed): 11 Don't do any port blocking for file URLs. 12 1 13 2007-07-20 Mitz Pettel <mitz@webkit.org> 2 14 -
trunk/WebCore/platform/network/ResourceHandle.cpp
r24202 r24484 162 162 + sizeof(blockedPortList) / sizeof(blockedPortList[0]); 163 163 164 // If the port is not in the blocked port list, allow it. 165 if (!std::binary_search(blockedPortList, blockedPortListEnd, port)) 166 return true; 167 164 168 // Allow ports 21 and 22 for FTP URLs, as Mozilla does. 165 return !std::binary_search(blockedPortList, blockedPortListEnd, port) 166 || ((port == 21 || port == 22) && request.url().url().startsWith("ftp:", false)); 169 if ((port == 21 || port == 22) && request.url().url().startsWith("ftp:", false)) 170 return true; 171 172 // Allow any port number in a file URL, since the port number is ignored. 173 if (request.url().url().startsWith("file:", false)) 174 return true; 175 176 return false; 167 177 } 168 178
Note: See TracChangeset
for help on using the changeset viewer.