]> git.pld-linux.org Git - packages/php.git/blob - php-5.3.7-bug-53037.patch
use /usr/sbin/php-fpm as other branches
[packages/php.git] / php-5.3.7-bug-53037.patch
1 --- PHP_5_3/ext/filter/sanitizing_filters.c     2011/04/03 12:25:43     309919
2 +++ PHP_5_3/ext/filter/sanitizing_filters.c     2011/04/03 16:30:31     309920
3 @@ -205,7 +205,11 @@
4  
5         if (new_len == 0) {
6                 zval_dtor(value);
7 -               ZVAL_EMPTY_STRING(value);
8 +               if (flags & FILTER_FLAG_EMPTY_STRING_NULL) {
9 +                       ZVAL_NULL(value);
10 +               } else {
11 +                       ZVAL_EMPTY_STRING(value);                       
12 +               }
13                 return;
14         }
15  }
16 @@ -280,6 +284,9 @@
17                 }
18  
19                 php_filter_encode_html(value, enc);     
20 +       } else if (flags & FILTER_FLAG_EMPTY_STRING_NULL && Z_STRLEN_P(value) == 0) {
21 +               zval_dtor(value);
22 +               ZVAL_NULL(value);
23         }
24  }
25  /* }}} */
This page took 0.029134 seconds and 3 git commands to generate.