lstrojny                Wed Aug 20 21:26:04 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard       var.c url.c 
  Log:
  Reverting local change
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var.c?r1=1.203.2.7.2.18.2.11&r2=1.203.2.7.2.18.2.12&diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.7.2.18.2.11 
php-src/ext/standard/var.c:1.203.2.7.2.18.2.12
--- php-src/ext/standard/var.c:1.203.2.7.2.18.2.11      Wed Aug 20 20:35:40 2008
+++ php-src/ext/standard/var.c  Wed Aug 20 21:26:04 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: var.c,v 1.203.2.7.2.18.2.11 2008/08/20 20:35:40 lstrojny Exp $ */
+/* $Id: var.c,v 1.203.2.7.2.18.2.12 2008/08/20 21:26:04 lstrojny Exp $ */
 
 /* {{{ includes
 */
@@ -422,7 +422,7 @@
                        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);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.86.2.5.2.7.2.5&r2=1.86.2.5.2.7.2.6&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.86.2.5.2.7.2.5 
php-src/ext/standard/url.c:1.86.2.5.2.7.2.6
--- php-src/ext/standard/url.c:1.86.2.5.2.7.2.5 Wed Aug 20 20:35:39 2008
+++ php-src/ext/standard/url.c  Wed Aug 20 21:26:04 2008
@@ -15,7 +15,7 @@
    | Author: Jim Winstead <[EMAIL PROTECTED]>                                  
|
    +----------------------------------------------------------------------+
  */
-/* $Id: url.c,v 1.86.2.5.2.7.2.5 2008/08/20 20:35:39 lstrojny Exp $ */
+/* $Id: url.c,v 1.86.2.5.2.7.2.6 2008/08/20 21:26:04 lstrojny Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -65,23 +65,21 @@
 {
        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)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to