date:20081206

[PHP-CVS] cvs: php-src / run-tests.php

2008-12-06 Thread Zoe Slattery

zoe Sat Dec  6 11:59:36 2008 UTC

  Modified files:  
/php-srcrun-tests.php 
  Log:
  More changes to allow the same tests to be used with PHP5 and PHP6
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.381r2=1.382diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.381 php-src/run-tests.php:1.382
--- php-src/run-tests.php:1.381 Thu Nov  6 03:08:58 2008
+++ php-src/run-tests.php   Sat Dec  6 11:59:36 2008
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.381 2008/11/06 03:08:58 scottmac Exp $ */
+/* $Id: run-tests.php,v 1.382 2008/12/06 11:59:36 zoe Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.381 $' . \n;
+   echo '$Revision: 1.382 $' . \n;
exit(1);
 
default:
@@ -1735,6 +1735,11 @@
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
$wanted_re = str_replace(
+   array('%binary_string_optional%'),
+   version_compare(PHP_VERSION, '6.0.0-dev') == -1 
? 'string' : 'binary string',
+   $wanted_re
+   );
+   $wanted_re = str_replace(
array('%unicode_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1 
? 'string' : 'Unicode string',
$wanted_re



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

[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php

2008-12-06 Thread Zoe Slattery

zoe Sat Dec  6 12:00:38 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcrun-tests.php 
  Log:
  More changes to allow the same tests to be used with PHP5 and PHP6
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.52r2=1.226.2.37.2.35.2.53diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.52 
php-src/run-tests.php:1.226.2.37.2.35.2.53
--- php-src/run-tests.php:1.226.2.37.2.35.2.52  Thu Nov  6 03:09:41 2008
+++ php-src/run-tests.php   Sat Dec  6 12:00:37 2008
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41 scottmac Exp 
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.53 2008/12/06 12:00:37 zoe Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.37.2.35.2.52 
$' . \n;
+   echo '$Revision: 1.226.2.37.2.35.2.53 
$' . \n;
exit(1);
 
default:
@@ -1730,6 +1730,11 @@
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
$wanted_re = str_replace(
+   array('%binary_string_optional%'),
+   version_compare(PHP_VERSION, '6.0.0-dev') == -1 
? 'string' : 'binary string',
+   $wanted_re
+   );
+   $wanted_re = str_replace(
array('%unicode_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1 
? 'string' : 'Unicode string',
$wanted_re



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

[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php

2008-12-06 Thread Zoe Slattery

zoe Sat Dec  6 12:02:24 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcrun-tests.php 
  Log:
  More changes to allow the same tests to be used with PHP5 and PHP6
  
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.51r2=1.226.2.37.2.52diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.51 
php-src/run-tests.php:1.226.2.37.2.52
--- php-src/run-tests.php:1.226.2.37.2.51   Wed Dec  3 14:27:43 2008
+++ php-src/run-tests.php   Sat Dec  6 12:02:24 2008
@@ -24,7 +24,7 @@
+--+
  */
 
-/* $Id: run-tests.php,v 1.226.2.37.2.51 2008/12/03 14:27:43 robinf Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.52 2008/12/06 12:02:24 zoe Exp $ */
 
 /* Sanity check to ensure that pcre extension needed by this script is 
available.
  * In the event it is not, print a nice error message indicating that this 
script will
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
-   echo '$Revision: 1.226.2.37.2.51 $' . 
\n;
+   echo '$Revision: 1.226.2.37.2.52 $' . 
\n;
exit(1);
 
default:
@@ -1725,6 +1725,12 @@
 
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
+   $wanted_re = str_replace(
+array('%binary_string_optional%'),
+version_compare(PHP_VERSION, '6.0.0-dev') == 
-1 ? 'string' : 'binary string',
+$wanted_re
+);
+
$wanted_re = str_replace(
array('%unicode_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1 
? 'string' : 'Unicode string',



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

[PHP-CVS] cvs: php-src /ext/spl spl_engine.h

2008-12-06 Thread Marcus Boerger

helly   Sat Dec  6 15:14:46 2008 UTC

  Modified files:  
/php-src/ext/splspl_engine.h 
  Log:
  - Drop dead code
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_engine.h?r1=1.27r2=1.28diff_format=u
Index: php-src/ext/spl/spl_engine.h
diff -u php-src/ext/spl/spl_engine.h:1.27 php-src/ext/spl/spl_engine.h:1.28
--- php-src/ext/spl/spl_engine.h:1.27   Fri Jun  6 23:53:10 2008
+++ php-src/ext/spl/spl_engine.hSat Dec  6 15:14:46 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_engine.h,v 1.27 2008/06/06 23:53:10 colder Exp $ */
+/* $Id: spl_engine.h,v 1.28 2008/12/06 15:14:46 helly Exp $ */
 
 #ifndef SPL_ENGINE_H
 #define SPL_ENGINE_H
@@ -26,17 +26,6 @@
 #include zend_interfaces.h
 #include zend_unicode.h
 
-/* {{{ zend_class_entry */
-static inline zend_class_entry *spl_get_class_entry(zval *obj TSRMLS_DC)
-{
-   if (obj  Z_TYPE_P(obj) == IS_OBJECT  
Z_OBJ_HT_P(obj)-get_class_entry) {
-   return Z_OBJ_HT_P(obj)-get_class_entry(obj TSRMLS_CC);
-   } else {
-   return NULL;
-   }
-}
-/* }}} */
-
 PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc 
TSRMLS_DC);
 
 PHPAPI long spl_offset_convert_to_long(zval *offset TSRMLS_DC);



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_engine.h

2008-12-06 Thread Marcus Boerger

helly   Sat Dec  6 15:16:00 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/splspl_engine.h 
  Log:
  - MFH Drop dead code
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_engine.h?r1=1.19.2.3.2.1.2.2r2=1.19.2.3.2.1.2.3diff_format=u
Index: php-src/ext/spl/spl_engine.h
diff -u php-src/ext/spl/spl_engine.h:1.19.2.3.2.1.2.2 
php-src/ext/spl/spl_engine.h:1.19.2.3.2.1.2.3
--- php-src/ext/spl/spl_engine.h:1.19.2.3.2.1.2.2   Fri Jun  6 23:53:43 2008
+++ php-src/ext/spl/spl_engine.hSat Dec  6 15:16:00 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_engine.h,v 1.19.2.3.2.1.2.2 2008/06/06 23:53:43 colder Exp $ */
+/* $Id: spl_engine.h,v 1.19.2.3.2.1.2.3 2008/12/06 15:16:00 helly Exp $ */
 
 #ifndef SPL_ENGINE_H
 #define SPL_ENGINE_H
@@ -25,17 +25,6 @@
 #include php_spl.h
 #include zend_interfaces.h
 
-/* {{{ zend_class_entry */
-static inline zend_class_entry *spl_get_class_entry(zval *obj TSRMLS_DC)
-{
-   if (obj  Z_TYPE_P(obj) == IS_OBJECT  
Z_OBJ_HT_P(obj)-get_class_entry) {
-   return Z_OBJ_HT_P(obj)-get_class_entry(obj TSRMLS_CC);
-   } else {
-   return NULL;
-   }
-}
-/* }}} */
-
 PHPAPI void spl_instantiate(zend_class_entry *pce, zval **object, int alloc 
TSRMLS_DC);
 
 PHPAPI long spl_offset_convert_to_long(zval *offset TSRMLS_DC);



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

[PHP-CVS] cvs: php-src /ext/spl spl_functions.c spl_functions.h

2008-12-06 Thread Marcus Boerger

helly   Sat Dec  6 15:24:33 2008 UTC

  Modified files:  
/php-src/ext/splspl_functions.c spl_functions.h 
  Log:
  - Remove more dead code
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.c?r1=1.42r2=1.43diff_format=u
Index: php-src/ext/spl/spl_functions.c
diff -u php-src/ext/spl/spl_functions.c:1.42 
php-src/ext/spl/spl_functions.c:1.43
--- php-src/ext/spl/spl_functions.c:1.42Mon Dec 31 07:12:15 2007
+++ php-src/ext/spl/spl_functions.c Sat Dec  6 15:24:33 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_functions.c,v 1.42 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: spl_functions.c,v 1.43 2008/12/06 15:24:33 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
#include config.h
@@ -27,14 +27,6 @@
 #include ext/standard/info.h
 #include php_spl.h
 
-/* {{{ spl_destroy_class */
-void spl_destroy_class(zend_class_entry ** ppce)
-{   
-   SPL_DEBUG(fprintf(stderr, Destroy(%s): %s\n, (*ppce)-type == 
ZEND_USER_CLASS ? user : other, (*ppce)-name);)
-   destroy_zend_class(ppce);
-}
-/* }}} */
-
 /* {{{ spl_register_interface */
 void spl_register_interface(zend_class_entry ** ppce, char * class_name, const 
zend_function_entry * functions TSRMLS_DC)
 {
@@ -77,20 +69,6 @@
 }
 /* }}} */
 
-/* {{{ spl_register_parent_ce */
-void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * 
parent_class TSRMLS_DC)
-{
-   class_entry-parent = parent_class;
-}
-/* }}} */
-
-/* {{{ spl_register_functions */
-void spl_register_functions(zend_class_entry * class_entry, const 
zend_function_entry * function_list TSRMLS_DC)
-{
-   zend_register_functions(class_entry, function_list, 
class_entry-function_table, MODULE_PERSISTENT TSRMLS_CC);
-}
-/* }}} */
-
 /* {{{ spl_register_property */
 void spl_register_property( zend_class_entry * class_entry, char *prop_name, 
int prop_name_len, int prop_flags TSRMLS_DC)
 {
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.h?r1=1.28r2=1.29diff_format=u
Index: php-src/ext/spl/spl_functions.h
diff -u php-src/ext/spl/spl_functions.h:1.28 
php-src/ext/spl/spl_functions.h:1.29
--- php-src/ext/spl/spl_functions.h:1.28Mon Dec 31 07:12:15 2007
+++ php-src/ext/spl/spl_functions.h Sat Dec  6 15:24:33 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_functions.h,v 1.28 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: spl_functions.h,v 1.29 2008/12/06 15:24:33 helly Exp $ */
 
 #ifndef PHP_FUNCTIONS_H
 #define PHP_FUNCTIONS_H
@@ -37,33 +37,22 @@
 #define REGISTER_SPL_INTERFACE(class_name) \
spl_register_interface(spl_ce_ ## class_name, # class_name, spl_funcs_ 
## class_name TSRMLS_CC);
 
-#define REGISTER_SPL_PARENT_CE(class_name, parent_class) \
-   spl_register_parent_ce(spl_ce_ ## class_name, spl_ce_ ## parent_class 
TSRMLS_CC);
-
 #define REGISTER_SPL_IMPLEMENTS(class_name, interface_name) \
zend_class_implements(spl_ce_ ## class_name TSRMLS_CC, 1, spl_ce_ ## 
interface_name);
 
 #define REGISTER_SPL_ITERATOR(class_name) \
zend_class_implements(spl_ce_ ## class_name TSRMLS_CC, 1, 
zend_ce_iterator);
 
-#define REGISTER_SPL_FUNCTIONS(class_name, function_list) \
-   spl_register_functions(spl_ce_ ## class_name, function_list TSRMLS_CC);
-
 #define REGISTER_SPL_PROPERTY(class_name, prop_name, prop_flags) \
spl_register_property(spl_ce_ ## class_name, prop_name, 
sizeof(prop_name)-1, prop_flags TSRMLS_CC);
 
 #define REGISTER_SPL_CLASS_CONST_LONG(class_name, const_name, value) \
zend_declare_class_constant_long(spl_ce_ ## class_name, const_name, 
sizeof(const_name)-1, (long)value TSRMLS_CC);
 
-void spl_destroy_class(zend_class_entry ** ppce);
-
 void spl_register_std_class(zend_class_entry ** ppce, char * class_name, 
create_object_func_t ctor, const zend_function_entry * function_list TSRMLS_DC);
 void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * 
parent_ce, char * class_name, create_object_func_t ctor, const 
zend_function_entry * function_list TSRMLS_DC);
-
 void spl_register_interface(zend_class_entry ** ppce, char * class_name, const 
zend_function_entry *functions TSRMLS_DC);
 
-void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * 
parent_class TSRMLS_DC);
-void spl_register_functions(zend_class_entry * class_entry, const 
zend_function_entry * function_list TSRMLS_DC);
 void spl_register_property( zend_class_entry * class_entry, char *prop_name, 
int prop_name_len, int prop_flags TSRMLS_DC);
 
 /* sub: whether to allow subclasses/interfaces



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_functions.c spl_functions.h

2008-12-06 Thread Marcus Boerger

helly   Sat Dec  6 15:24:47 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/splspl_functions.c spl_functions.h 
  Log:
  - MFH Remove more dead code
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.c?r1=1.28.2.3.2.3.2.3r2=1.28.2.3.2.3.2.4diff_format=u
Index: php-src/ext/spl/spl_functions.c
diff -u php-src/ext/spl/spl_functions.c:1.28.2.3.2.3.2.3 
php-src/ext/spl/spl_functions.c:1.28.2.3.2.3.2.4
--- php-src/ext/spl/spl_functions.c:1.28.2.3.2.3.2.3Mon Dec 31 07:17:14 2007
+++ php-src/ext/spl/spl_functions.c Sat Dec  6 15:24:47 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_functions.c,v 1.28.2.3.2.3.2.3 2007/12/31 07:17:14 sebastian Exp $ 
*/
+/* $Id: spl_functions.c,v 1.28.2.3.2.3.2.4 2008/12/06 15:24:47 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
#include config.h
@@ -27,14 +27,6 @@
 #include ext/standard/info.h
 #include php_spl.h
 
-/* {{{ spl_destroy_class */
-void spl_destroy_class(zend_class_entry ** ppce)
-{   
-   SPL_DEBUG(fprintf(stderr, Destroy(%s): %s\n, (*ppce)-type == 
ZEND_USER_CLASS ? user : other, (*ppce)-name);)
-   destroy_zend_class(ppce);
-}
-/* }}} */
-
 /* {{{ spl_register_interface */
 void spl_register_interface(zend_class_entry ** ppce, char * class_name, const 
zend_function_entry * functions TSRMLS_DC)
 {
@@ -77,20 +69,6 @@
 }
 /* }}} */
 
-/* {{{ spl_register_parent_ce */
-void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * 
parent_class TSRMLS_DC)
-{
-   class_entry-parent = parent_class;
-}
-/* }}} */
-
-/* {{{ spl_register_functions */
-void spl_register_functions(zend_class_entry * class_entry, const 
zend_function_entry * function_list TSRMLS_DC)
-{
-   zend_register_functions(class_entry, function_list, 
class_entry-function_table, MODULE_PERSISTENT TSRMLS_CC);
-}
-/* }}} */
-
 /* {{{ spl_register_property */
 void spl_register_property( zend_class_entry * class_entry, char *prop_name, 
int prop_name_len, int prop_flags TSRMLS_DC)
 {
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_functions.h?r1=1.19.2.3.2.2.2.3r2=1.19.2.3.2.2.2.4diff_format=u
Index: php-src/ext/spl/spl_functions.h
diff -u php-src/ext/spl/spl_functions.h:1.19.2.3.2.2.2.3 
php-src/ext/spl/spl_functions.h:1.19.2.3.2.2.2.4
--- php-src/ext/spl/spl_functions.h:1.19.2.3.2.2.2.3Mon Dec 31 07:17:14 2007
+++ php-src/ext/spl/spl_functions.h Sat Dec  6 15:24:47 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_functions.h,v 1.19.2.3.2.2.2.3 2007/12/31 07:17:14 sebastian Exp $ 
*/
+/* $Id: spl_functions.h,v 1.19.2.3.2.2.2.4 2008/12/06 15:24:47 helly Exp $ */
 
 #ifndef PHP_FUNCTIONS_H
 #define PHP_FUNCTIONS_H
@@ -37,33 +37,22 @@
 #define REGISTER_SPL_INTERFACE(class_name) \
spl_register_interface(spl_ce_ ## class_name, # class_name, spl_funcs_ 
## class_name TSRMLS_CC);
 
-#define REGISTER_SPL_PARENT_CE(class_name, parent_class) \
-   spl_register_parent_ce(spl_ce_ ## class_name, spl_ce_ ## parent_class 
TSRMLS_CC);
-
 #define REGISTER_SPL_IMPLEMENTS(class_name, interface_name) \
zend_class_implements(spl_ce_ ## class_name TSRMLS_CC, 1, spl_ce_ ## 
interface_name);
 
 #define REGISTER_SPL_ITERATOR(class_name) \
zend_class_implements(spl_ce_ ## class_name TSRMLS_CC, 1, 
zend_ce_iterator);
 
-#define REGISTER_SPL_FUNCTIONS(class_name, function_list) \
-   spl_register_functions(spl_ce_ ## class_name, function_list TSRMLS_CC);
-
 #define REGISTER_SPL_PROPERTY(class_name, prop_name, prop_flags) \
spl_register_property(spl_ce_ ## class_name, prop_name, 
sizeof(prop_name)-1, prop_flags TSRMLS_CC);
 
 #define REGISTER_SPL_CLASS_CONST_LONG(class_name, const_name, value) \
zend_declare_class_constant_long(spl_ce_ ## class_name, const_name, 
sizeof(const_name)-1, (long)value TSRMLS_CC);
 
-void spl_destroy_class(zend_class_entry ** ppce);
-
 void spl_register_std_class(zend_class_entry ** ppce, char * class_name, 
create_object_func_t ctor, const zend_function_entry * function_list TSRMLS_DC);
 void spl_register_sub_class(zend_class_entry ** ppce, zend_class_entry * 
parent_ce, char * class_name, create_object_func_t ctor, const 
zend_function_entry * function_list TSRMLS_DC);
-
 void spl_register_interface(zend_class_entry ** ppce, char * class_name, const 
zend_function_entry *functions TSRMLS_DC);
 
-void spl_register_parent_ce(zend_class_entry * class_entry, zend_class_entry * 
parent_class TSRMLS_DC);
-void spl_register_functions(zend_class_entry * class_entry, const 
zend_function_entry * function_list TSRMLS_DC);
 void spl_register_property( zend_class_entry * class_entry, char *prop_name, 
int prop_name_len, int prop_flags TSRMLS_DC);
 
 /* sub: whether to allow subclasses/interfaces



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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c

2008-12-06 Thread Scott MacVicar

scottmacSat Dec  6 17:16:36 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/filter filter.c 
  Log:
  Back out bugfix for #42718 as this broke magic_quotes_gpc
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.43r2=1.52.2.44diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.43 
php-src/ext/filter/filter.c:1.52.2.44
--- php-src/ext/filter/filter.c:1.52.2.43   Sun Nov  2 22:04:40 2008
+++ php-src/ext/filter/filter.c Sat Dec  6 17:16:36 2008
@@ -19,7 +19,7 @@
   +--+
 */
 
-/* $Id: filter.c,v 1.52.2.43 2008/11/02 22:04:40 lbarnaud Exp $ */
+/* $Id: filter.c,v 1.52.2.44 2008/12/06 17:16:36 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -275,7 +275,7 @@
 {
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering, 
enabled );
-   php_info_print_table_row( 2, Revision, $Revision: 1.52.2.43 $);
+   php_info_print_table_row( 2, Revision, $Revision: 1.52.2.44 $);
php_info_print_table_end();
 
DISPLAY_INI_ENTRIES();
@@ -403,7 +403,7 @@
Z_STRLEN(new_var) = val_len;
Z_TYPE(new_var) = IS_STRING;
 
-   if (IF_G(default_filter) != FILTER_UNSAFE_RAW || 
IF_G(default_filter_flags) != 0) {
+   if (IF_G(default_filter) != FILTER_UNSAFE_RAW) {
zval *tmp_new_var = new_var;
Z_STRVAL(new_var) = estrndup(*val, val_len);
INIT_PZVAL(tmp_new_var);



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

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter filter.c

2008-12-06 Thread Scott MacVicar

scottmacSat Dec  6 17:25:35 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/filter filter.c 
  Log:
  MFB: Back out bugfix for #42718 as this broke magic_quotes_gpc
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.39.2.11r2=1.52.2.39.2.12diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.39.2.11 
php-src/ext/filter/filter.c:1.52.2.39.2.12
--- php-src/ext/filter/filter.c:1.52.2.39.2.11  Mon Nov 17 11:27:54 2008
+++ php-src/ext/filter/filter.c Sat Dec  6 17:25:35 2008
@@ -19,7 +19,7 @@
   +--+
 */
 
-/* $Id: filter.c,v 1.52.2.39.2.11 2008/11/17 11:27:54 felipe Exp $ */
+/* $Id: filter.c,v 1.52.2.39.2.12 2008/12/06 17:25:35 scottmac Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -312,7 +312,7 @@
 {
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering, 
enabled );
-   php_info_print_table_row( 2, Revision, $Revision: 1.52.2.39.2.11 $);
+   php_info_print_table_row( 2, Revision, $Revision: 1.52.2.39.2.12 $);
php_info_print_table_end();
 
DISPLAY_INI_ENTRIES();
@@ -440,7 +440,7 @@
Z_STRLEN(new_var) = val_len;
Z_TYPE(new_var) = IS_STRING;
 
-   if (IF_G(default_filter) != FILTER_UNSAFE_RAW || 
IF_G(default_filter_flags) != 0) {
+   if (IF_G(default_filter) != FILTER_UNSAFE_RAW) {
zval *tmp_new_var = new_var;
Z_STRVAL(new_var) = estrndup(*val, val_len);
INIT_PZVAL(tmp_new_var);



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

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c

2008-12-06 Thread Arnaud Le Blanc


Arg :(
It seems default_filter_flags actually had a non-zero default value, which is 
not shown by ini_get().


On Saturday 06 December 2008 18:16:36 Scott MacVicar wrote:
 scottmac  Sat Dec  6 17:16:36 2008 UTC
 
   Modified files:  (Branch: PHP_5_2)
 /php-src/ext/filter   filter.c 
   Log:
   Back out bugfix for #42718 as this broke magic_quotes_gpc
   
   
 http://cvs.php.net/viewvc.cgi/php-
src/ext/filter/filter.c?r1=1.52.2.43r2=1.52.2.44diff_format=u
 Index: php-src/ext/filter/filter.c
 diff -u php-src/ext/filter/filter.c:1.52.2.43 php-
src/ext/filter/filter.c:1.52.2.44
 --- php-src/ext/filter/filter.c:1.52.2.43 Sun Nov  2 22:04:40 2008
 +++ php-src/ext/filter/filter.c   Sat Dec  6 17:16:36 2008
 @@ -19,7 +19,7 @@
+--+
  */
  
 -/* $Id: filter.c,v 1.52.2.43 2008/11/02 22:04:40 lbarnaud Exp $ */
 +/* $Id: filter.c,v 1.52.2.44 2008/12/06 17:16:36 scottmac Exp $ */
  
  #ifdef HAVE_CONFIG_H
  #include config.h
 @@ -275,7 +275,7 @@
  {
   php_info_print_table_start();
   php_info_print_table_row( 2, Input Validation and Filtering, 
 enabled 
);
 - php_info_print_table_row( 2, Revision, $Revision: 1.52.2.43 $);
 + php_info_print_table_row( 2, Revision, $Revision: 1.52.2.44 $);
   php_info_print_table_end();
  
   DISPLAY_INI_ENTRIES();
 @@ -403,7 +403,7 @@
   Z_STRLEN(new_var) = val_len;
   Z_TYPE(new_var) = IS_STRING;
  
 - if (IF_G(default_filter) != FILTER_UNSAFE_RAW || 
IF_G(default_filter_flags) != 0) {
 + if (IF_G(default_filter) != FILTER_UNSAFE_RAW) {
   zval *tmp_new_var = new_var;
   Z_STRVAL(new_var) = estrndup(*val, val_len);
   INIT_PZVAL(tmp_new_var);
 
 
 
 -- 
 PHP CVS Mailing List (http://www.php.net/)
 To unsubscribe, visit: http://www.php.net/unsub.php
 
 


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

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter filter.c

2008-12-06 Thread Ilia Alshanetsky

This is a fairly serious regression, looks like we may need a quick  
5.2.8 to address it.



On 6-Dec-08, at 12:25 PM, Scott MacVicar wrote:


scottmacSat Dec  6 17:25:35 2008 UTC

 Modified files:  (Branch: PHP_5_3)
   /php-src/ext/filter  filter.c
 Log:
 MFB: Back out bugfix for #42718 as this broke magic_quotes_gpc


http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.39.2.11r2=1.52.2.39.2.12diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.39.2.11 php-src/ext/ 
filter/filter.c:1.52.2.39.2.12
--- php-src/ext/filter/filter.c:1.52.2.39.2.11	Mon Nov 17 11:27:54  
2008

+++ php-src/ext/filter/filter.c Sat Dec  6 17:25:35 2008
@@ -19,7 +19,7 @@
   
+ 
--+

*/

-/* $Id: filter.c,v 1.52.2.39.2.11 2008/11/17 11:27:54 felipe Exp $ */
+/* $Id: filter.c,v 1.52.2.39.2.12 2008/12/06 17:25:35 scottmac Exp  
$ */


#ifdef HAVE_CONFIG_H
#include config.h
@@ -312,7 +312,7 @@
{
php_info_print_table_start();
	php_info_print_table_row( 2, Input Validation and Filtering,  
enabled );
-	php_info_print_table_row( 2, Revision, $Revision:  
1.52.2.39.2.11 $);
+	php_info_print_table_row( 2, Revision, $Revision:  
1.52.2.39.2.12 $);

php_info_print_table_end();

DISPLAY_INI_ENTRIES();
@@ -440,7 +440,7 @@
Z_STRLEN(new_var) = val_len;
Z_TYPE(new_var) = IS_STRING;

-		if (IF_G(default_filter) != FILTER_UNSAFE_RAW ||  
IF_G(default_filter_flags) != 0) {

+   if (IF_G(default_filter) != FILTER_UNSAFE_RAW) {
zval *tmp_new_var = new_var;
Z_STRVAL(new_var) = estrndup(*val, val_len);
INIT_PZVAL(tmp_new_var);



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



Ilia Alshanetsky





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

[PHP-CVS] cvs: CVSROOT / avail

2008-12-06 Thread Pierre-Alain Joye

pajoye  Sun Dec  7 02:15:48 2008 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  - pecl/fuse karma for B. Carrol
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1473r2=1.1474diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1473 CVSROOT/avail:1.1474
--- CVSROOT/avail:1.1473Tue Dec  2 14:53:54 2008
+++ CVSROOT/avail   Sun Dec  7 02:15:47 2008
@@ -302,7 +302,7 @@
 avail|sean|pecl/parsekit
 avail|magicaltux|php-src/ext/wddx
 avail|mikesul|pecl/ssh2
-
+avail|rjcarroll|pecl/fuse
 
 # Objective-C bridge
 avail|wez,jan|php-objc



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

[PHP-CVS] cvs: php-src / run-tests.php

[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php

[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php

[PHP-CVS] cvs: php-src /ext/spl spl_engine.h

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_engine.h

[PHP-CVS] cvs: php-src /ext/spl spl_functions.c spl_functions.h

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_functions.c spl_functions.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter filter.c

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c

Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter filter.c

[PHP-CVS] cvs: CVSROOT / avail

12 matches

Site Navigation

Mail list logo

Footer information