svn: /php/php-src/branches/PHP_5_3_1/ext/standard/ strnatcmp.c
| From: | Pierre-Alain Joye | Date: | Fri, 09 Oct 2009 14:33:38 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_1/ext/standard/ strnatcmp.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60616@lists.php.net to get a copy of this message | ||
pajoye Fri, 09 Oct 2009 14:33:38 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289419
Log:
- Merge: Fix for bug #49698
Bug: http://bugs.php.net/49698 (Closed) Unexpected change in
strnatcasecmp()
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/standard/strnatcmp.c
Modified: php/php-src/branches/PHP_5_3_1/ext/standard/strnatcmp.c
===================================================================
--- php/php-src/branches/PHP_5_3_1/ext/standard/strnatcmp.c 2009-10-09 14:25:51 UTC (rev 289418)
+++ php/php-src/branches/PHP_5_3_1/ext/standard/strnatcmp.c 2009-10-09 14:33:38 UTC (rev 289419)
@@ -116,12 +116,12 @@
while (1) {
ca = *ap; cb = *bp;
- /* skip over leading zeros unless they are followed by punctuation */
- while (leading && ca == '0' && (ap+1 < aend) &&
!ispunct(*(ap+1))) {
+ /* skip over leading zeros */
+ while (leading && ca == '0' && (ap+1 < aend) &&
isdigit(*(ap+1))) {
ca = *++ap;
}
- while (leading && cb == '0' && (bp+1 < bend) &&
!ispunct(*(bp+1))) {
+ while (leading && cb == '0' && (bp+1 < bend) &&
isdigit(*(bp+1))) {
cb = *++bp;
}