Reverting local change

diff --git a/ext/standard/url.c b/ext/standard/url.c
index 7d354d4c80bfb8541a6c607053c809d7038b0370..9dc8a2fe8b5eadae28d046add118c2a7a8a7832c 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -65,23 +65,21 @@ PHPAPI char *php_replace_controlchars_ex(char *str, int len)
 {
        unsigned char *s = (unsigned char *)str;
        unsigned char *e = (unsigned char *)str + len;
-       unsigned char *r[len + 1];
-       unsigned int c = 0;
-
+       
        if (!str) {
-               return NULL;
+               return (NULL);
        }
-
+       
        while (s < e) {
-               if (0 == iscntrl(*s)) {
-                       r[c] = *s;
-                       c++;
-               }
+           
+               if (iscntrl(*s)) {
+                       *s='_';
+               }       
                s++;
        }
-
-       return (unsigned char *)r;
-}
+       
+       return (str);
+} 
 /* }}} */
 
 PHPAPI char *php_replace_controlchars(char *str)

diff --git a/ext/standard/var.c b/ext/standard/var.c
index f1823b8aa6b7da78e7191aab2402b2f23246e4a5..6f4fe053618cb684b89c3085b3845c6a4974877f 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -422,7 +422,7 @@ PHPAPI void php_var_export(zval **struc, int level TSRMLS_DC) /* {{{ */
                        php_printf("\n%*c", level - 1, ' ');
                }
                Z_OBJ_HANDLER(**struc, get_class_name)(*struc, &class_name, &class_name_len, 0 TSRMLS_CC);
-               php_printf ("%s::__setState(array(\n", class_name);
+               php_printf ("%s::__set_state(array(\n", class_name);
                efree(class_name);
                if (myht) {
                        zend_hash_apply_with_arguments(myht TSRMLS_CC, (apply_func_args_t) php_object_element_export, 1, level);