Backing out changes.

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 72d3d53cffcc57657c53170cc11d6a71db1ab949..b01f659bdd148aa8bfc8e1877b2311ab2126ae75 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -561,7 +561,7 @@ PHP_FUNCTION(split)
        }
 
        /* churn through str, generating array entries as we go */
-       while ((count == -1 || count > 0) && !(err = regexec(&re, strp, 1, subs, 0))) {
+       while ((count == -1 || count > 1) && !(err = regexec(&re, strp, 1, subs, 0))) {
                if (subs[0].rm_so == 0 && subs[0].rm_eo) {
                        /* match is at start of string, return empty string */
                        add_next_index_stringl(return_value, empty_string, 0, 1);
@@ -604,11 +604,9 @@ PHP_FUNCTION(split)
        }
 
        /* otherwise we just have one last element to add to the array */
-       if (count == -1 || err==REG_NOMATCH) {
-               size = endp - strp;
+       size = endp - strp;
        
-               add_next_index_stringl(return_value, strp, size, 1);
-       }
+       add_next_index_stringl(return_value, strp, size, 1);
 
        regfree(&re);
 

diff --git a/ext/standard/reg.c b/ext/standard/reg.c
index 72d3d53cffcc57657c53170cc11d6a71db1ab949..b01f659bdd148aa8bfc8e1877b2311ab2126ae75 100644 (file)
--- a/ext/standard/reg.c
+++ b/ext/standard/reg.c
@@ -561,7 +561,7 @@ PHP_FUNCTION(split)
        }
 
        /* churn through str, generating array entries as we go */
-       while ((count == -1 || count > 0) && !(err = regexec(&re, strp, 1, subs, 0))) {
+       while ((count == -1 || count > 1) && !(err = regexec(&re, strp, 1, subs, 0))) {
                if (subs[0].rm_so == 0 && subs[0].rm_eo) {
                        /* match is at start of string, return empty string */
                        add_next_index_stringl(return_value, empty_string, 0, 1);
@@ -604,11 +604,9 @@ PHP_FUNCTION(split)
        }
 
        /* otherwise we just have one last element to add to the array */
-       if (count == -1 || err==REG_NOMATCH) {
-               size = endp - strp;
+       size = endp - strp;
        
-               add_next_index_stringl(return_value, strp, size, 1);
-       }
+       add_next_index_stringl(return_value, strp, size, 1);
 
        regfree(&re);