revert last commit for now

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 132118661da47b516e48ff4d93b97da45645d280..ceafe568110c9e1bbd945b02e02de49a129840b6 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2331,14 +2331,9 @@ PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC)
                                        l--;
                                }
                                *s++ = *t++;
-                       } else if (*t == '\\' && l > 0) {
-                               if(t[1] == '0') {
-                                       *s++='\0';
-                                       t++;
-                               } else {
-                                       *s++=*(++t);
-                               }
-                               t++;
+                       } else if (*t == '\\' && t[1] == '0' && l > 0) {
+                               *s++='\0';
+                               t+=2;
                                if (len != NULL) {
                                        (*len)--;
                                }
@@ -2633,10 +2628,6 @@ PHPAPI char *php_addslashes(char *str, int length, int *new_length, int should_f
                                        *target++ = '\'';
                                        *target++ = '\'';
                                        break;
-                               case '\\':
-                                       *target++ = '\\';
-                                       *target++ = '\\';
-                                       break;
                                default:
                                        *target++ = *source;
                                        break;