Restore intra-string whitespace collapsing broken in the previous change.

diff --git a/ext/standard/strnatcmp.c b/ext/standard/strnatcmp.c
index bfea61f74f7d8506a4bc07db1f4d88524e6d3245..b756a86afb76e0b3fc14d4c9e1a9c57120501f0f 100644 (file)
--- a/ext/standard/strnatcmp.c
+++ b/ext/standard/strnatcmp.c
@@ -112,17 +112,26 @@ PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len
        while (1) {
                ca = a[ai]; cb = b[bi];
 
-               /* skip over leading spaces or zeros */
-               while (leading && (isspace((int)(unsigned char)ca) || ((ca == '0' && (ai+1 < a_len)) && !ispunct(a[ai+1])))) {
+               /* skip over leading zeros unless they are followed by punctuation */
+               while (leading && ca == '0' && (ai+1 < a_len) && !ispunct(a[ai+1])) {
                        ca = a[++ai];
                }
 
-               while (leading && (isspace((int)(unsigned char)cb) || ((cb == '0' && bi+1 < b_len) && !ispunct(b[bi+1])))) {
+               while (leading && cb == '0' && (bi+1 < b_len) && !ispunct(b[bi+1])) {
                        cb = b[++bi];
                }
 
                leading = 0;
 
+               /* Strip consecutive whitespace */
+               while (isspace((int)(unsigned char)ca)) {
+                       ca = a[++ai];
+               }
+
+               while (isspace((int)(unsigned char)cb)) {
+                       cb = b[++bi];
+               }
+
                /* process run of digits */
                if (isdigit((int)(unsigned char)ca)  &&  isdigit((int)(unsigned char)cb)) {
                        fractional = (ca == '0' || cb == '0');