Modified:
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/UrlValidator.html
==============================================================================
---
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/UrlValidator.html
(original)
+++
websites/production/commons/content/proper/commons-validator/apidocs/src-html/org/apache/commons/validator/UrlValidator.html
Fri Dec 26 12:51:02 2014
@@ -79,7 +79,7 @@
<span class="sourceLineNo">071</span> * Uniform Resource Identifiers (URI):
Generic Syntax<a name="line.71"></a>
<span class="sourceLineNo">072</span> * </a><a name="line.72"></a>
<span class="sourceLineNo">073</span> *<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * @version $Revision: 1647900 $ $Date:
2014-12-25 16:03:53 +0100 (Do, 25 Dez 2014) $<a name="line.74"></a>
+<span class="sourceLineNo">074</span> * @version $Revision: 1647964 $ $Date:
2014-12-26 13:33:35 +0100 (Fr, 26 Dez 2014) $<a name="line.74"></a>
<span class="sourceLineNo">075</span> * @since Validator 1.1<a
name="line.75"></a>
<span class="sourceLineNo">076</span> * @deprecated Use the new UrlValidator
in the routines package. This class<a name="line.76"></a>
<span class="sourceLineNo">077</span> * will be removed in a future release.<a
name="line.77"></a>
@@ -301,185 +301,178 @@
<span class="sourceLineNo">293</span> return false;<a
name="line.293"></a>
<span class="sourceLineNo">294</span> }<a name="line.294"></a>
<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> if
(this.options.isOff(ALLOW_ALL_SCHEMES)) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> if
(!this.allowedSchemes.contains(scheme)) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return false;<a
name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">296</span> if
(options.isOff(ALLOW_ALL_SCHEMES) && !allowedSchemes.contains(scheme))
{<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return false;<a
name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> return true;<a
name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> return true;<a
name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span> /**<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * Returns true if the authority is
properly formatted. An authority is the combination<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * of hostname and port. A
<code>null</code> authority value is considered invalid.<a
name="line.308"></a>
-<span class="sourceLineNo">309</span> * @param authority Authority value
to validate.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * @return true if authority
(hostname and port) is valid.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> */<a name="line.311"></a>
-<span class="sourceLineNo">312</span> protected boolean
isValidAuthority(String authority) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> if (authority == null) {<a
name="line.313"></a>
-<span class="sourceLineNo">314</span> return false;<a
name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">303</span> /**<a name="line.303"></a>
+<span class="sourceLineNo">304</span> * Returns true if the authority is
properly formatted. An authority is the combination<a name="line.304"></a>
+<span class="sourceLineNo">305</span> * of hostname and port. A
<code>null</code> authority value is considered invalid.<a
name="line.305"></a>
+<span class="sourceLineNo">306</span> * @param authority Authority value
to validate.<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * @return true if authority
(hostname and port) is valid.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> */<a name="line.308"></a>
+<span class="sourceLineNo">309</span> protected boolean
isValidAuthority(String authority) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> if (authority == null) {<a
name="line.310"></a>
+<span class="sourceLineNo">311</span> return false;<a
name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span><a name="line.313"></a>
+<span class="sourceLineNo">314</span> InetAddressValidator
inetAddressValidator =<a name="line.314"></a>
+<span class="sourceLineNo">315</span>
InetAddressValidator.getInstance();<a name="line.315"></a>
<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> InetAddressValidator
inetAddressValidator =<a name="line.317"></a>
-<span class="sourceLineNo">318</span>
InetAddressValidator.getInstance();<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> Matcher authorityMatcher =
AUTHORITY_PATTERN.matcher(authority);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> if (!authorityMatcher.matches())
{<a name="line.321"></a>
-<span class="sourceLineNo">322</span> return false;<a
name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span> boolean hostname = false;<a
name="line.325"></a>
-<span class="sourceLineNo">326</span> // check if authority is IP
address or hostname<a name="line.326"></a>
-<span class="sourceLineNo">327</span> String hostIP =
authorityMatcher.group(PARSE_AUTHORITY_HOST_IP);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> boolean ipV4Address =
inetAddressValidator.isValid(hostIP);<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> if (!ipV4Address) {<a
name="line.330"></a>
-<span class="sourceLineNo">331</span> // Domain is hostname name<a
name="line.331"></a>
-<span class="sourceLineNo">332</span> hostname =
DOMAIN_PATTERN.matcher(hostIP).matches();<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> //rightmost hostname will never
start with a digit.<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (hostname) {<a
name="line.336"></a>
-<span class="sourceLineNo">337</span> // LOW-TECH FIX FOR
VALIDATOR-202<a name="line.337"></a>
-<span class="sourceLineNo">338</span> // TODO: Rewrite to use
ArrayList and .add semantics: see VALIDATOR-203<a name="line.338"></a>
-<span class="sourceLineNo">339</span> char[] chars =
hostIP.toCharArray();<a name="line.339"></a>
-<span class="sourceLineNo">340</span> int size = 1;<a
name="line.340"></a>
-<span class="sourceLineNo">341</span> for(int i=0;
i<chars.length; i++) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> if(chars[i] == '.') {<a
name="line.342"></a>
-<span class="sourceLineNo">343</span> size++;<a
name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span> String[] domainSegment = new
String[size];<a name="line.346"></a>
-<span class="sourceLineNo">347</span> boolean match = true;<a
name="line.347"></a>
-<span class="sourceLineNo">348</span> int segmentCount = 0;<a
name="line.348"></a>
-<span class="sourceLineNo">349</span> int segmentLength = 0;<a
name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> while (match) {<a
name="line.351"></a>
-<span class="sourceLineNo">352</span> Matcher atomMatcher =
ATOM_PATTERN.matcher(hostIP);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> match =
atomMatcher.matches();<a name="line.353"></a>
-<span class="sourceLineNo">354</span> if (match) {<a
name="line.354"></a>
-<span class="sourceLineNo">355</span>
domainSegment[segmentCount] = atomMatcher.group(1);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> segmentLength =
domainSegment[segmentCount].length() + 1;<a name="line.356"></a>
-<span class="sourceLineNo">357</span> hostIP =<a
name="line.357"></a>
-<span class="sourceLineNo">358</span>
(segmentLength >= hostIP.length())<a name="line.358"></a>
-<span class="sourceLineNo">359</span> ? ""<a
name="line.359"></a>
-<span class="sourceLineNo">360</span> :
hostIP.substring(segmentLength);<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> segmentCount++;<a
name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> String topLevel =
domainSegment[segmentCount - 1];<a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (topLevel.length() < 2
|| topLevel.length() > 4) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> return false;<a
name="line.367"></a>
-<span class="sourceLineNo">368</span> }<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> // First letter of top level
must be a alpha<a name="line.370"></a>
-<span class="sourceLineNo">371</span> if
(!ALPHA_PATTERN.matcher(topLevel.substring(0, 1)).matches()) {<a
name="line.371"></a>
-<span class="sourceLineNo">372</span> return false;<a
name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> // Make sure there's a host
name preceding the authority.<a name="line.375"></a>
-<span class="sourceLineNo">376</span> if (segmentCount < 2) {<a
name="line.376"></a>
-<span class="sourceLineNo">377</span> return false;<a
name="line.377"></a>
-<span class="sourceLineNo">378</span> }<a name="line.378"></a>
-<span class="sourceLineNo">379</span> }<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (!hostname &&
!ipV4Address) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return false;<a
name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> String port =
authorityMatcher.group(PARSE_AUTHORITY_PORT);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (port != null) {<a
name="line.386"></a>
-<span class="sourceLineNo">387</span> if
(!PORT_PATTERN.matcher(port).matches()) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> return false;<a
name="line.388"></a>
-<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">317</span> Matcher authorityMatcher =
AUTHORITY_PATTERN.matcher(authority);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> if (!authorityMatcher.matches())
{<a name="line.318"></a>
+<span class="sourceLineNo">319</span> return false;<a
name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> boolean hostname = false;<a
name="line.322"></a>
+<span class="sourceLineNo">323</span> // check if authority is IP
address or hostname<a name="line.323"></a>
+<span class="sourceLineNo">324</span> String hostIP =
authorityMatcher.group(PARSE_AUTHORITY_HOST_IP);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> boolean ipV4Address =
inetAddressValidator.isValid(hostIP);<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> if (!ipV4Address) {<a
name="line.327"></a>
+<span class="sourceLineNo">328</span> // Domain is hostname name<a
name="line.328"></a>
+<span class="sourceLineNo">329</span> hostname =
DOMAIN_PATTERN.matcher(hostIP).matches();<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> //rightmost hostname will never
start with a digit.<a name="line.332"></a>
+<span class="sourceLineNo">333</span> if (hostname) {<a
name="line.333"></a>
+<span class="sourceLineNo">334</span> // LOW-TECH FIX FOR
VALIDATOR-202<a name="line.334"></a>
+<span class="sourceLineNo">335</span> // TODO: Rewrite to use
ArrayList and .add semantics: see VALIDATOR-203<a name="line.335"></a>
+<span class="sourceLineNo">336</span> char[] chars =
hostIP.toCharArray();<a name="line.336"></a>
+<span class="sourceLineNo">337</span> int size = 1;<a
name="line.337"></a>
+<span class="sourceLineNo">338</span> for(int i=0;
i<chars.length; i++) {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> if(chars[i] == '.') {<a
name="line.339"></a>
+<span class="sourceLineNo">340</span> size++;<a
name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span> }<a name="line.342"></a>
+<span class="sourceLineNo">343</span> String[] domainSegment = new
String[size];<a name="line.343"></a>
+<span class="sourceLineNo">344</span> boolean match = true;<a
name="line.344"></a>
+<span class="sourceLineNo">345</span> int segmentCount = 0;<a
name="line.345"></a>
+<span class="sourceLineNo">346</span> int segmentLength = 0;<a
name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> while (match) {<a
name="line.348"></a>
+<span class="sourceLineNo">349</span> Matcher atomMatcher =
ATOM_PATTERN.matcher(hostIP);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> match =
atomMatcher.matches();<a name="line.350"></a>
+<span class="sourceLineNo">351</span> if (match) {<a
name="line.351"></a>
+<span class="sourceLineNo">352</span>
domainSegment[segmentCount] = atomMatcher.group(1);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> segmentLength =
domainSegment[segmentCount].length() + 1;<a name="line.353"></a>
+<span class="sourceLineNo">354</span> hostIP =<a
name="line.354"></a>
+<span class="sourceLineNo">355</span>
(segmentLength >= hostIP.length())<a name="line.355"></a>
+<span class="sourceLineNo">356</span> ? ""<a
name="line.356"></a>
+<span class="sourceLineNo">357</span> :
hostIP.substring(segmentLength);<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> segmentCount++;<a
name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span> String topLevel =
domainSegment[segmentCount - 1];<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (topLevel.length() < 2
|| topLevel.length() > 4) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> return false;<a
name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span> // First letter of top level
must be a alpha<a name="line.367"></a>
+<span class="sourceLineNo">368</span> if
(!ALPHA_PATTERN.matcher(topLevel.substring(0, 1)).matches()) {<a
name="line.368"></a>
+<span class="sourceLineNo">369</span> return false;<a
name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> // Make sure there's a host
name preceding the authority.<a name="line.372"></a>
+<span class="sourceLineNo">373</span> if (segmentCount < 2) {<a
name="line.373"></a>
+<span class="sourceLineNo">374</span> return false;<a
name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> if (!hostname &&
!ipV4Address) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span> return false;<a
name="line.379"></a>
+<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> String port =
authorityMatcher.group(PARSE_AUTHORITY_PORT);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (port != null &&
!PORT_PATTERN.matcher(port).matches()) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> return false;<a
name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span> String extra =
authorityMatcher.group(PARSE_AUTHORITY_EXTRA);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> if
(!GenericValidator.isBlankOrNull(extra)) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> return false;<a
name="line.389"></a>
<span class="sourceLineNo">390</span> }<a name="line.390"></a>
<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> String extra =
authorityMatcher.group(PARSE_AUTHORITY_EXTRA);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> if
(!GenericValidator.isBlankOrNull(extra)) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> return false;<a
name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> return true;<a
name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> /**<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * Returns true if the path is valid.
A <code>null</code> value is considered invalid.<a
name="line.401"></a>
-<span class="sourceLineNo">402</span> * @param path Path value to
validate.<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * @return true if path is valid.<a
name="line.403"></a>
-<span class="sourceLineNo">404</span> */<a name="line.404"></a>
-<span class="sourceLineNo">405</span> protected boolean isValidPath(String
path) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> if (path == null) {<a
name="line.406"></a>
-<span class="sourceLineNo">407</span> return false;<a
name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> if
(!PATH_PATTERN.matcher(path).matches()) {<a name="line.410"></a>
+<span class="sourceLineNo">392</span> return true;<a
name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span> /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * Returns true if the path is valid.
A <code>null</code> value is considered invalid.<a
name="line.396"></a>
+<span class="sourceLineNo">397</span> * @param path Path value to
validate.<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * @return true if path is valid.<a
name="line.398"></a>
+<span class="sourceLineNo">399</span> */<a name="line.399"></a>
+<span class="sourceLineNo">400</span> protected boolean isValidPath(String
path) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> if (path == null) {<a
name="line.401"></a>
+<span class="sourceLineNo">402</span> return false;<a
name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> if
(!PATH_PATTERN.matcher(path).matches()) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> return false;<a
name="line.406"></a>
+<span class="sourceLineNo">407</span> }<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span> int slash2Count =
countToken("//", path);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> if
(options.isOff(ALLOW_2_SLASHES) && (slash2Count > 0)) {<a
name="line.410"></a>
<span class="sourceLineNo">411</span> return false;<a
name="line.411"></a>
<span class="sourceLineNo">412</span> }<a name="line.412"></a>
<span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span> int slash2Count =
countToken("//", path);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> if
(this.options.isOff(ALLOW_2_SLASHES) && (slash2Count > 0)) {<a
name="line.415"></a>
-<span class="sourceLineNo">416</span> return false;<a
name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> int slashCount = countToken("/",
path);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> int dot2Count = countToken("..",
path);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> if (dot2Count > 0) {<a
name="line.421"></a>
-<span class="sourceLineNo">422</span> if ((slashCount - slash2Count
- 1) <= dot2Count) {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> return false;<a
name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span> }<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span> return true;<a
name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * Returns true if the query is null
or it's a properly formatted query string.<a name="line.431"></a>
-<span class="sourceLineNo">432</span> * @param query Query value to
validate.<a name="line.432"></a>
-<span class="sourceLineNo">433</span> * @return true if query is valid.<a
name="line.433"></a>
-<span class="sourceLineNo">434</span> */<a name="line.434"></a>
-<span class="sourceLineNo">435</span> protected boolean isValidQuery(String
query) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (query == null) {<a
name="line.436"></a>
-<span class="sourceLineNo">437</span> return true;<a
name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> return
QUERY_PATTERN.matcher(query).matches();<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> /**<a name="line.443"></a>
-<span class="sourceLineNo">444</span> * Returns true if the given fragment
is null or fragments are allowed.<a name="line.444"></a>
-<span class="sourceLineNo">445</span> * @param fragment Fragment value to
validate.<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * @return true if fragment is
valid.<a name="line.446"></a>
-<span class="sourceLineNo">447</span> */<a name="line.447"></a>
-<span class="sourceLineNo">448</span> protected boolean
isValidFragment(String fragment) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> if (fragment == null) {<a
name="line.449"></a>
-<span class="sourceLineNo">450</span> return true;<a
name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> return
this.options.isOff(NO_FRAGMENTS);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> /**<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * Returns the number of times the
token appears in the target.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @param token Token value to be
counted.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> * @param target Target value to
count tokens in.<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * @return the number of tokens.<a
name="line.460"></a>
-<span class="sourceLineNo">461</span> */<a name="line.461"></a>
-<span class="sourceLineNo">462</span> protected int countToken(String
token, String target) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> int tokenIndex = 0;<a
name="line.463"></a>
-<span class="sourceLineNo">464</span> int count = 0;<a
name="line.464"></a>
-<span class="sourceLineNo">465</span> while (tokenIndex != -1) {<a
name="line.465"></a>
-<span class="sourceLineNo">466</span> tokenIndex =
target.indexOf(token, tokenIndex);<a name="line.466"></a>
-<span class="sourceLineNo">467</span> if (tokenIndex > -1) {<a
name="line.467"></a>
-<span class="sourceLineNo">468</span> tokenIndex++;<a
name="line.468"></a>
-<span class="sourceLineNo">469</span> count++;<a
name="line.469"></a>
-<span class="sourceLineNo">470</span> }<a name="line.470"></a>
-<span class="sourceLineNo">471</span> }<a name="line.471"></a>
-<span class="sourceLineNo">472</span> return count;<a
name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span>}<a name="line.474"></a>
+<span class="sourceLineNo">414</span> int slashCount = countToken("/",
path);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> int dot2Count = countToken("..",
path);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (dot2Count > 0 &&
(slashCount - slash2Count - 1) <= dot2Count){<a name="line.416"></a>
+<span class="sourceLineNo">417</span> return false;<a
name="line.417"></a>
+<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">419</span><a name="line.419"></a>
+<span class="sourceLineNo">420</span> return true;<a
name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span><a name="line.422"></a>
+<span class="sourceLineNo">423</span> /**<a name="line.423"></a>
+<span class="sourceLineNo">424</span> * Returns true if the query is null
or it's a properly formatted query string.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * @param query Query value to
validate.<a name="line.425"></a>
+<span class="sourceLineNo">426</span> * @return true if query is valid.<a
name="line.426"></a>
+<span class="sourceLineNo">427</span> */<a name="line.427"></a>
+<span class="sourceLineNo">428</span> protected boolean isValidQuery(String
query) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> if (query == null) {<a
name="line.429"></a>
+<span class="sourceLineNo">430</span> return true;<a
name="line.430"></a>
+<span class="sourceLineNo">431</span> }<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span> return
QUERY_PATTERN.matcher(query).matches();<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span> /**<a name="line.436"></a>
+<span class="sourceLineNo">437</span> * Returns true if the given fragment
is null or fragments are allowed.<a name="line.437"></a>
+<span class="sourceLineNo">438</span> * @param fragment Fragment value to
validate.<a name="line.438"></a>
+<span class="sourceLineNo">439</span> * @return true if fragment is
valid.<a name="line.439"></a>
+<span class="sourceLineNo">440</span> */<a name="line.440"></a>
+<span class="sourceLineNo">441</span> protected boolean
isValidFragment(String fragment) {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> if (fragment == null) {<a
name="line.442"></a>
+<span class="sourceLineNo">443</span> return true;<a
name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> return
options.isOff(NO_FRAGMENTS);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * Returns the number of times the
token appears in the target.<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * @param token Token value to be
counted.<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * @param target Target value to
count tokens in.<a name="line.452"></a>
+<span class="sourceLineNo">453</span> * @return the number of tokens.<a
name="line.453"></a>
+<span class="sourceLineNo">454</span> */<a name="line.454"></a>
+<span class="sourceLineNo">455</span> protected int countToken(String
token, String target) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> int tokenIndex = 0;<a
name="line.456"></a>
+<span class="sourceLineNo">457</span> int count = 0;<a
name="line.457"></a>
+<span class="sourceLineNo">458</span> while (tokenIndex != -1) {<a
name="line.458"></a>
+<span class="sourceLineNo">459</span> tokenIndex =
target.indexOf(token, tokenIndex);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> if (tokenIndex > -1) {<a
name="line.460"></a>
+<span class="sourceLineNo">461</span> tokenIndex++;<a
name="line.461"></a>
+<span class="sourceLineNo">462</span> count++;<a
name="line.462"></a>
+<span class="sourceLineNo">463</span> }<a name="line.463"></a>
+<span class="sourceLineNo">464</span> }<a name="line.464"></a>
+<span class="sourceLineNo">465</span> return count;<a
name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span>}<a name="line.467"></a>
