You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2006/05/19 23:17:01 UTC
svn commit: r407914 - /xerces/c/trunk/src/xercesc/util/XMLUri.cpp
Author: amassari
Date: Fri May 19 14:17:01 2006
New Revision: 407914
URL: http://svn.apache.org/viewvc?rev=407914&view=rev
Log:
The fix for jira#1581 was relaxing other checks too
Modified:
xerces/c/trunk/src/xercesc/util/XMLUri.cpp
Modified: xerces/c/trunk/src/xercesc/util/XMLUri.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUri.cpp?rev=407914&r1=407913&r2=407914&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUri.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUri.cpp Fri May 19 14:17:01 2006
@@ -2443,8 +2443,12 @@
!XMLString::isHex(pathStr[index+2]))
return false;
}
- else if ((testChar==chSpace && !bAllowSpaces) &&
- !isUnreservedCharacter(testChar) &&
+ else if (testChar==chSpace)
+ {
+ if(!bAllowSpaces)
+ return false;
+ }
+ else if (!isUnreservedCharacter(testChar) &&
((isOpaque && !isPathCharacter(testChar)) ||
(!isOpaque && !isReservedCharacter(testChar))))
{
@@ -2476,8 +2480,12 @@
!XMLString::isHex(pathStr[index+2]))
return false;
}
- else if ((testChar==chSpace && !bAllowSpaces) &&
- !isReservedOrUnreservedCharacter(testChar))
+ else if (testChar==chSpace)
+ {
+ if(!bAllowSpaces)
+ return false;
+ }
+ else if (!isReservedOrUnreservedCharacter(testChar))
{
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org