[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2009-06-23 Thread changelog 
changelog   Wed Jun 24 01:33:06 2009 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3443r2=1.3444diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3443 php-src/ChangeLog:1.3444
--- php-src/ChangeLog:1.3443Tue Jun 23 01:33:10 2009
+++ php-src/ChangeLog   Wed Jun 24 01:33:04 2009
@@ -1,3 +1,182 @@
+2009-06-23  andy wharmby  whar...@uk.ibm.com
+
+* ext/pcre/tests/preg_match_all_error3.phpt
+  ext/pcre/tests/preg_match_all_error3.phpt
+  ext/pcre/tests/preg_match_all_error3.phpt:
+  Fix test
+
+* ext/standard/tests/strings/htmlentities09.phpt
+  ext/standard/tests/strings/htmlentities09.phpt
+  ext/standard/tests/strings/htmlentities09.phpt
+  ext/standard/tests/strings/htmlentities16.phpt
+  ext/standard/tests/strings/htmlentities16.phpt
+  ext/standard/tests/strings/htmlentities16.phpt
+  ext/standard/tests/strings/htmlspecialchars_basic.phpt
+  ext/standard/tests/strings/htmlspecialchars_basic.phpt
+  ext/standard/tests/strings/htmlspecialchars_basic.phpt
+  ext/standard/tests/strings/htmlspecialchars_basic.phpt
+  ext/standard/tests/strings/htmlspecialchars_basic.phpt
+  ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
+  ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
+  ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
+  ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt
+  ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt
+  ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt:
+  New and fixed html tests. Tested in Windows, Linux and Linux 64.
+
+* (PHP_5_2)
+  ext/standard/tests/strings/parse_str_basic1.phpt
+  ext/standard/tests/strings/parse_str_basic1.phpt
+  ext/standard/tests/strings/parse_str_basic2.phpt
+  ext/standard/tests/strings/parse_str_basic2.phpt
+  ext/standard/tests/strings/parse_str_basic3.phpt
+  ext/standard/tests/strings/parse_str_basic3.phpt
+  ext/standard/tests/strings/parse_str_basic4.phpt
+  ext/standard/tests/strings/parse_str_basic4.phpt
+  ext/standard/tests/strings/parse_str_error1.phpt
+  ext/standard/tests/strings/parse_str_error1.phpt:
+  New basic parse_str() tests. Tested on Windows,Linux and Lnux 64 bit. 
Some
+  tests fail on PHP 6 (tagged with XFAIL) due to bug 48658
+
+* ext/standard/tests/strings/parse_str_basic1.phpt
+  ext/standard/tests/strings/parse_str_basic1.phpt
+  ext/standard/tests/strings/parse_str_basic1.phpt
+  ext/standard/tests/strings/parse_str_basic2.phpt
+  ext/standard/tests/strings/parse_str_basic2.phpt
+  ext/standard/tests/strings/parse_str_basic2.phpt
+  ext/standard/tests/strings/parse_str_basic3.phpt
+  ext/standard/tests/strings/parse_str_basic3.phpt
+  ext/standard/tests/strings/parse_str_basic3.phpt
+  ext/standard/tests/strings/parse_str_basic4.phpt
+  ext/standard/tests/strings/parse_str_basic4.phpt
+  ext/standard/tests/strings/parse_str_basic4.phpt
+  ext/standard/tests/strings/parse_str_error1.phpt
+  ext/standard/tests/strings/parse_str_error1.phpt
+  ext/standard/tests/strings/parse_str_error1.phpt:
+1.1.4;
+  New basic parse_str() tests. Tested on Windows,Linux and Lnux 64 bit. 
Some
+  tests fail on PHP 6 (tagged with XFAIL) due to bug 48658
+
+2009-06-23  Gwynne Raskind  gwy...@darkrainfall.org
+
+* ext/posix/posix.c:
+  add S_IRWXU and friends as defined POSIX constants
+
+2009-06-23  Hannes Magnusson  hannes.magnus...@gmail.com
+
+* (PHP_5_3)
+  UPGRADING:
+  Missing items
+
+2009-06-23  Johannes Schlüter  johan...@schlueters.de
+
+* ext/spl/php_spl.h:
+  Fix build problem (Kalle)
+
+2009-06-23  David Soria Parra  dso...@gmx.net
+
+* (PHP_5_3)
+  ext/mysqlnd/mysqlnd_result.c:
+  MFH: Fix bug #48644 mysqlnd does not compile with
+  '--enable-mysqlnd-threading'
+
+* ext/mysqlnd/mysqlnd_result.c:
+  Fix bug #48644 mysqlnd does not compile with '--enable-mysqlnd-threading'
+
+2009-06-23  Hannes Magnusson  hannes.magnus...@gmail.com
+
+* (PHP_5_3)
+  ext/libxml/libxml.c:
+  MFH: Fix arginfo for libxml_disable_entity_loader() and
+  libxml_use_internal_errors()
+
+* (PHP_5_3)
+  UPGRADING:
+  better place for it
+
+* (PHP_5_3)
+  UPGRADING:
+  TZ is no longer used to guess the timezone
+
+2009-06-23  Johannes Schlüter  johan...@schlueters.de
+
+* (PHP_5_3)
+  ext/mysqlnd/config9.m4:
+  MFH The experimental warning sohuld be in the configure output...
+
+* ext/mysqlnd/config9.m4:
+  The experimental warning sohuld be in the configure output...
+
+* ext/json/config.m4
+  ext/json/config.m4:
+  The json header should be installed so other exts can use it
+

[PHP-CVS] cvs: php-src /ext/standard config.w32 /win32/build config.w32.h.in

2009-06-23 Thread Kalle Sommer Nielsen 
kalle   Tue Jun 23 06:55:45 2009 UTC

  Modified files:  
/php-src/ext/standard   config.w32 
/php-src/win32/buildconfig.w32.h.in 
  Log:
  Move these defines to config.w32.h
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.w32?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/standard/config.w32
diff -u php-src/ext/standard/config.w32:1.12 
php-src/ext/standard/config.w32:1.13
--- php-src/ext/standard/config.w32:1.12Fri Jan 16 10:04:29 2009
+++ php-src/ext/standard/config.w32 Tue Jun 23 06:55:45 2009
@@ -1,12 +1,9 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.12 2009/01/16 10:04:29 pajoye Exp $
+// $Id: config.w32,v 1.13 2009/06/23 06:55:45 kalle Exp $
 
 ARG_WITH(config-file-scan-dir, Dir to check for additional php ini files, 
);
 
 AC_DEFINE(PHP_CONFIG_FILE_SCAN_DIR, PHP_CONFIG_FILE_SCAN_DIR);
-AC_DEFINE(HAVE_INET_PTON, 1);
-AC_DEFINE(HAVE_INET_NTOP, 1);
-
 AC_DEFINE(PHP_USE_PHP_CRYPT_R, 1);
 
 CHECK_HEADER_ADD_INCLUDE(timelib_config.h, CFLAGS_STANDARD, 
ext/date/lib);
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.27r2=1.28diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.27 
php-src/win32/build/config.w32.h.in:1.28
--- php-src/win32/build/config.w32.h.in:1.27Fri May 29 08:18:42 2009
+++ php-src/win32/build/config.w32.h.in Tue Jun 23 06:55:45 2009
@@ -1,6 +1,6 @@
 /*
Build Configuration Template for Win32.
-   $Id: config.w32.h.in,v 1.27 2009/05/29 08:18:42 pajoye Exp $
+   $Id: config.w32.h.in,v 1.28 2009/06/23 06:55:45 kalle Exp $
 */
 
 /* Define the minimum supported version */
@@ -155,6 +155,10 @@
 /* Win32 support proc_open */
 #define PHP_CAN_SUPPORT_PROC_OPEN 1
 
+/* inet_ptop()  inet_nton() */
+#define HAVE_INET_PTON 1
+#define HAVE_INET_NTOP 1
+
 #define HAVE_MBLEN
 
 #undef HAVE_ATOF_ACCEPTS_NAN



-- 
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) / NEWS /ext/standard config.w32 /win32/build config.w32.h.in

2009-06-23 Thread Kalle Sommer Nielsen 
kalle   Tue Jun 23 06:56:45 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcNEWS 
/php-src/ext/standard   config.w32 
/php-src/win32/buildconfig.w32.h.in 
  Log:
  MFH: Move these defines to config.w32.h
  
  Also credit Pierre for the inet_ntop()/inet_pton() implementations
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.644r2=1.2027.2.547.2.965.2.645diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.644 
php-src/NEWS:1.2027.2.547.2.965.2.645
--- php-src/NEWS:1.2027.2.547.2.965.2.644   Mon Jun 22 22:14:37 2009
+++ php-src/NEWSTue Jun 23 06:56:45 2009
@@ -1,4 +1,4 @@
-PHPNEWS
+PHP
NEWS
 |||
 ?? ??? 2009, PHP 5.3.0 RC 5
 - Fixed bug #48641 (tmpfile() uses old parameter parsing).
@@ -744,7 +744,7 @@
 - Added PREG_BAD_UTF8_OFFSET_ERROR constant. (Nuno)
 - Added native support for asinh(), acosh(), atanh(), log1p() and expm1().
   (Kalle)
-- Added inet_pton() and inet_ntop() also for Windows platforms. (Kalle)
+- Added inet_pton() and inet_ntop() also for Windows platforms. (Kalle, Pierre)
 - Added mcrypt_create_iv() also for Windows platforms. (Pierre)
 
 - Fixed html_entity_decode() incorrectly converting numeric html entities
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.w32?r1=1.4.2.2.2.1.2.6r2=1.4.2.2.2.1.2.7diff_format=u
Index: php-src/ext/standard/config.w32
diff -u php-src/ext/standard/config.w32:1.4.2.2.2.1.2.6 
php-src/ext/standard/config.w32:1.4.2.2.2.1.2.7
--- php-src/ext/standard/config.w32:1.4.2.2.2.1.2.6 Fri Jan 16 01:00:22 2009
+++ php-src/ext/standard/config.w32 Tue Jun 23 06:56:45 2009
@@ -1,12 +1,9 @@
 // vim:ft=javascript
-// $Id: config.w32,v 1.4.2.2.2.1.2.6 2009/01/16 01:00:22 pajoye Exp $
+// $Id: config.w32,v 1.4.2.2.2.1.2.7 2009/06/23 06:56:45 kalle Exp $
 
 ARG_WITH(config-file-scan-dir, Dir to check for additional php ini files, 
);
 
 AC_DEFINE(PHP_CONFIG_FILE_SCAN_DIR, PHP_CONFIG_FILE_SCAN_DIR);
-AC_DEFINE(HAVE_INET_PTON, 1);
-AC_DEFINE(HAVE_INET_NTOP, 1);
-
 AC_DEFINE(PHP_USE_PHP_CRYPT_R, 1);
 
 CHECK_HEADER_ADD_INCLUDE(timelib_config.h, CFLAGS_STANDARD, 
ext/date/lib);
@@ -26,5 +23,5 @@
streamsfuncs.c http.c flock_compat.c, false /* never shared */);
 
 if (PHP_MBREGEX != no) {
-   CHECK_HEADER_ADD_INCLUDE(oniguruma.h, CFLAGS_STANDARD, PHP_MBREGEX + 
;ext\\mbstring\\oniguruma)   
+   CHECK_HEADER_ADD_INCLUDE(oniguruma.h, CFLAGS_STANDARD, PHP_MBREGEX 
+ ;ext\\mbstring\\oniguruma)   
 }
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.4.2.3.2.13r2=1.7.2.4.2.3.2.14diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.13 
php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.14
--- php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.13Fri May 29 
08:11:36 2009
+++ php-src/win32/build/config.w32.h.in Tue Jun 23 06:56:45 2009
@@ -1,6 +1,6 @@
 /*
Build Configuration Template for Win32.
-   $Id: config.w32.h.in,v 1.7.2.4.2.3.2.13 2009/05/29 08:11:36 pajoye Exp $
+   $Id: config.w32.h.in,v 1.7.2.4.2.3.2.14 2009/06/23 06:56:45 kalle Exp $
 */
 
 /* Define the minimum supported version */
@@ -156,6 +156,10 @@
 /* Win32 support proc_open */
 #define PHP_CAN_SUPPORT_PROC_OPEN 1
 
+/* inet_ntop() / inet_pton() */
+#define HAVE_INET_PTON 1
+#define HAVE_INET_NTOP 1
+
 #define HAVE_MBLEN
 
 #undef HAVE_ATOF_ACCEPTS_NAN



-- 
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/gd/libgd gd.c

2009-06-23 Thread Kalle Sommer Nielsen 
kalle   Tue Jun 23 07:09:19 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/gd/libgd   gd.c 
  Log:
  Whops, nobody saw this :)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1.2.28r2=1.90.2.1.2.29diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1.2.28 
php-src/ext/gd/libgd/gd.c:1.90.2.1.2.29
--- php-src/ext/gd/libgd/gd.c:1.90.2.1.2.28 Mon Jun 22 15:52:59 2009
+++ php-src/ext/gd/libgd/gd.c   Tue Jun 23 07:09:19 2009
@@ -3879,7 +3879,7 @@
}
gdImageSaveAlpha(srcback, 1);
new_pxl = gdImageColorAllocateAlpha(srcback, 0, 0, 0, 127);
-   gdImageFill(srcback, 0, 0, new_pxl;
+   gdImageFill(srcback, 0, 0, new_pxl);
 
gdImageCopy(srcback, src,0,0,0,0,src-sx,src-sy);
 



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

[PHP-CVS] cvs: php-src /ext/libxml libxml.c

2009-06-23 Thread Rob Richards 
rrichards   Tue Jun 23 10:49:01 2009 UTC

  Modified files:  
/php-src/ext/libxml libxml.c 
  Log:
  add libxml_disable_entity_loader function
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.77r2=1.78diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.77 php-src/ext/libxml/libxml.c:1.78
--- php-src/ext/libxml/libxml.c:1.77Thu Mar 26 22:16:48 2009
+++ php-src/ext/libxml/libxml.c Tue Jun 23 10:49:00 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.77 2009/03/26 22:16:48 felipe Exp $ */
+/* $Id: libxml.c,v 1.78 2009/06/23 10:49:00 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -68,6 +68,7 @@
 static PHP_FUNCTION(libxml_get_last_error);
 static PHP_FUNCTION(libxml_clear_errors);
 static PHP_FUNCTION(libxml_get_errors);
+static PHP_FUNCTION(libxml_disable_entity_loader);
 
 static zend_class_entry *libxmlerror_class_entry;
 
@@ -104,6 +105,10 @@
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_clear_errors, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO(arginfo_libxml_disable_entity_loader, 0)
+   ZEND_ARG_INFO(0, disable)
+ZEND_END_ARG_INFO()
+
 /* }}} */
 
 /* {{{ extension definition structures */
@@ -113,6 +118,7 @@
PHP_FE(libxml_get_last_error, arginfo_libxml_get_last_error)
PHP_FE(libxml_clear_errors, arginfo_libxml_clear_errors)
PHP_FE(libxml_get_errors, arginfo_libxml_get_errors)
+   PHP_FE(libxml_disable_entity_loader, 
arginfo_libxml_disable_entity_loader)
{NULL, NULL, NULL}
 };
 
@@ -344,6 +350,12 @@
 }
 
 static xmlParserInputBufferPtr
+php_libxml_input_buffer_noload(const char *URI, xmlCharEncoding enc)
+{
+   return NULL;
+}
+
+static xmlParserInputBufferPtr
 php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
 {
xmlParserInputBufferPtr ret;
@@ -820,6 +832,31 @@
 }
 /* }}} */
 
+/* {{{ proto bool libxml_disable_entity_loader([boolean disable]) 
+   Disable/Enable ability to load external entities */
+static PHP_FUNCTION(libxml_disable_entity_loader)
+{
+   zend_bool disable = 1;
+   xmlParserInputBufferCreateFilenameFunc old;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, disable) == 
FAILURE) {
+   return;
+   }
+
+   if (disable == 0) {
+   old = 
xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_create_filename);
+   } else {
+   old = 
xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_noload);
+   }
+
+   if (old == php_libxml_input_buffer_noload) {
+   RETURN_TRUE;
+   }
+
+   RETURN_FALSE;
+}
+/* }}} */
+
 /* {{{ Common functions shared by extensions */
 int php_libxml_xmlCheckUTF8(const unsigned char *s)
 {



-- 
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/libxml libxml.c

2009-06-23 Thread Rob Richards 
rrichards   Tue Jun 23 10:50:09 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/libxml libxml.c 
  Log:
  MFH: add libxml_disable_entity_loader function
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.15.2.11r2=1.32.2.7.2.15.2.12diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.11 
php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.12
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.11  Sat Mar 14 17:30:28 2009
+++ php-src/ext/libxml/libxml.c Tue Jun 23 10:50:09 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.32.2.7.2.15.2.11 2009/03/14 17:30:28 rrichards Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.15.2.12 2009/06/23 10:50:09 rrichards Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -68,6 +68,7 @@
 static PHP_FUNCTION(libxml_get_last_error);
 static PHP_FUNCTION(libxml_clear_errors);
 static PHP_FUNCTION(libxml_get_errors);
+static PHP_FUNCTION(libxml_disable_entity_loader);
 
 static zend_class_entry *libxmlerror_class_entry;
 
@@ -104,6 +105,10 @@
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_clear_errors, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO(arginfo_libxml_disable_entity_loader, 0)
+   ZEND_ARG_INFO(0, disable)
+ZEND_END_ARG_INFO()
+
 /* }}} */
 
 /* {{{ extension definition structures */
@@ -113,6 +118,7 @@
PHP_FE(libxml_get_last_error, arginfo_libxml_get_last_error)
PHP_FE(libxml_clear_errors, arginfo_libxml_clear_errors)
PHP_FE(libxml_get_errors, arginfo_libxml_get_errors)
+   PHP_FE(libxml_disable_entity_loader, 
arginfo_libxml_disable_entity_loader)
{NULL, NULL, NULL}
 };
 
@@ -344,6 +350,12 @@
 }
 
 static xmlParserInputBufferPtr
+php_libxml_input_buffer_noload(const char *URI, xmlCharEncoding enc)
+{
+   return NULL;
+}
+
+static xmlParserInputBufferPtr
 php_libxml_input_buffer_create_filename(const char *URI, xmlCharEncoding enc)
 {
xmlParserInputBufferPtr ret;
@@ -820,6 +832,31 @@
 }
 /* }}} */
 
+/* {{{ proto bool libxml_disable_entity_loader([boolean disable]) 
+   Disable/Enable ability to load external entities */
+static PHP_FUNCTION(libxml_disable_entity_loader)
+{
+   zend_bool disable = 1;
+   xmlParserInputBufferCreateFilenameFunc old;
+
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |b, disable) == 
FAILURE) {
+   return;
+   }
+
+   if (disable == 0) {
+   old = 
xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_create_filename);
+   } else {
+   old = 
xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_noload);
+   }
+
+   if (old == php_libxml_input_buffer_noload) {
+   RETURN_TRUE;
+   }
+
+   RETURN_FALSE;
+}
+/* }}} */
+
 /* {{{ Common functions shared by extensions */
 int php_libxml_xmlCheckUTF8(const unsigned char *s)
 {



-- 
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) / UPGRADING

2009-06-23 Thread Hannes Magnusson 
bjori   Tue Jun 23 11:13:06 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcUPGRADING 
  Log:
  New function
  
  
http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.15r2=1.1.2.3.2.1.2.16diff_format=u
Index: php-src/UPGRADING
diff -u php-src/UPGRADING:1.1.2.3.2.1.2.15 php-src/UPGRADING:1.1.2.3.2.1.2.16
--- php-src/UPGRADING:1.1.2.3.2.1.2.15  Mon Jun 22 10:30:23 2009
+++ php-src/UPGRADING   Tue Jun 23 11:13:05 2009
@@ -1,4 +1,4 @@
-$Id: UPGRADING,v 1.1.2.3.2.1.2.15 2009/06/22 10:30:23 bjori Exp $
+$Id: UPGRADING,v 1.1.2.3.2.1.2.16 2009/06/23 11:13:05 bjori Exp $
 
 UPGRADE NOTES - PHP 5.3
 
@@ -334,6 +334,7 @@
- GMP: gmp_testbit()
- Hash:hash_copy()
- JSON:json_last_error()
+   - libxml:  libxml_disable_entity_loader
- MySQLi:  mysqli_fetch_all()
   mysqli_get_connection_stats()
   mysqli_poll()



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

[PHP-CVS] cvs: php-src /ext/libxml libxml.c

2009-06-23 Thread Hannes Magnusson 
bjori   Tue Jun 23 12:27:36 2009 UTC

  Modified files:  
/php-src/ext/libxml libxml.c 
  Log:
  Fix arginfo for libxml_disable_entity_loader() and
  libxml_use_internal_errors()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.78r2=1.79diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.78 php-src/ext/libxml/libxml.c:1.79
--- php-src/ext/libxml/libxml.c:1.78Tue Jun 23 10:49:00 2009
+++ php-src/ext/libxml/libxml.c Tue Jun 23 12:27:36 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.78 2009/06/23 10:49:00 rrichards Exp $ */
+/* $Id: libxml.c,v 1.79 2009/06/23 12:27:36 bjori Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -92,7 +92,7 @@
ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_libxml_use_internal_errors, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_libxml_use_internal_errors, 0, 0, 0)
ZEND_ARG_INFO(0, use_errors)
 ZEND_END_ARG_INFO()
 
@@ -105,7 +105,7 @@
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_clear_errors, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_libxml_disable_entity_loader, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_libxml_disable_entity_loader, 0, 0, 0)
ZEND_ARG_INFO(0, disable)
 ZEND_END_ARG_INFO()
 



-- 
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/libxml libxml.c

2009-06-23 Thread Hannes Magnusson 
bjori   Tue Jun 23 12:38:32 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/libxml libxml.c 
  Log:
  MFH: fix arginfo for libxml_use_internal_errors()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.18r2=1.32.2.7.2.19diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.18 
php-src/ext/libxml/libxml.c:1.32.2.7.2.19
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.18   Wed Dec 31 11:17:39 2008
+++ php-src/ext/libxml/libxml.c Tue Jun 23 12:38:32 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.32.2.7.2.18 2008/12/31 11:17:39 sebastian Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.19 2009/06/23 12:38:32 bjori Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -93,7 +93,7 @@
 ZEND_END_ARG_INFO()
 
 static
-ZEND_BEGIN_ARG_INFO(arginfo_libxml_use_internal_errors, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_libxml_use_internal_errors, 0, 0, 0)
ZEND_ARG_INFO(0, use_errors)
 ZEND_END_ARG_INFO()
 



-- 
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/imap php_imap.c

2009-06-23 Thread Ilia Alshanetsky 
iliaa   Tue Jun 23 12:43:10 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/imap   php_imap.c 
  Log:
  Fixed build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/php_imap.c?r1=1.208.2.7.2.52r2=1.208.2.7.2.53diff_format=u
Index: php-src/ext/imap/php_imap.c
diff -u php-src/ext/imap/php_imap.c:1.208.2.7.2.52 
php-src/ext/imap/php_imap.c:1.208.2.7.2.53
--- php-src/ext/imap/php_imap.c:1.208.2.7.2.52  Mon Jun 22 20:42:04 2009
+++ php-src/ext/imap/php_imap.c Tue Jun 23 12:43:10 2009
@@ -26,7 +26,7 @@
| PHP 4.0 updates:  Zeev Suraski z...@zend.com   |
+--+
  */
-/* $Id: php_imap.c,v 1.208.2.7.2.52 2009/06/22 20:42:04 pajoye Exp $ */
+/* $Id: php_imap.c,v 1.208.2.7.2.53 2009/06/23 12:43:10 iliaa Exp $ */
 
 #define IMAP41
 
@@ -2670,7 +2670,7 @@
 
slst = mail_sort(imap_le_struct-imap_stream, (myargc == 6 ? 
Z_STRVAL_PP(charset) : NIL), spg, mypgm, (myargc = 4 ? Z_LVAL_PP(flags) : 
NIL));
 
-   if (spg  !(flags  SE_FREE)) {
+   if (spg  myargc = 4  !(Z_LVAL_PP(flags)  SE_FREE)) {
mail_free_searchpgm(spg);
}
 



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

[PHP-CVS] cvs: phpruntests /src rtClassMap.php /src/testcase/exceptions rtPhpRunnerException.php

2009-06-23 Thread Georg Gradwohl 
g2  Tue Jun 23 12:59:52 2009 UTC

  Added files: 
/phpruntests/src/testcase/exceptionsrtPhpRunnerException.php 

  Modified files:  
/phpruntests/srcrtClassMap.php 
  Log:
  phpruntests - fixed wrong class-filename
  
http://cvs.php.net/viewvc.cgi/phpruntests/src/rtClassMap.php?r1=1.12r2=1.13diff_format=u
Index: phpruntests/src/rtClassMap.php
diff -u phpruntests/src/rtClassMap.php:1.12 phpruntests/src/rtClassMap.php:1.13
--- phpruntests/src/rtClassMap.php:1.12 Tue Jun  2 08:03:32 2009
+++ phpruntests/src/rtClassMap.php  Tue Jun 23 12:59:51 2009
@@ -48,7 +48,7 @@
 'rtPhptFilterIterator' = 'rtPhptFilterIterator.php',
 'rtText'   = 'rtText.php',
 'rtUtil'   = 'rtUtil.php',
-'rtCodeRunnerException'= 
'testcase/exceptions/rtCodeRunnerException.php',
+'rtPhpRunnerException' = 
'testcase/exceptions/rtPhpRunnerException.php',
 'rtTestOutputWriterList'   = 
'testcase/output/rtTestOutputWriterList.php',
 'rtTestOutputWriterXML'= 
'testcase/output/rtTestOutputWriterXML.php',
 'rtHasMandatorySections'   = 
'testcase/preconditions/rtHasMandatorySections.php',

http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/exceptions/rtPhpRunnerException.php?view=markuprev=1.1
Index: phpruntests/src/testcase/exceptions/rtPhpRunnerException.php
+++ phpruntests/src/testcase/exceptions/rtPhpRunnerException.php
?php
/**
 *
 */
class rtPhpRunnerException extends RunTimeException
{ 
}
?



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

[PHP-CVS] cvs: php-src /ext/json config.m4

2009-06-23 Thread Johannes Schlüter 
johannesTue Jun 23 13:09:21 2009 UTC

  Modified files:  
/php-src/ext/json   config.m4 
  Log:
  The json header should be installed so other exts can use it
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.m4?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/json/config.m4
diff -u php-src/ext/json/config.m4:1.7 php-src/ext/json/config.m4:1.8
--- php-src/ext/json/config.m4:1.7  Tue Jul  3 17:24:36 2007
+++ php-src/ext/json/config.m4  Tue Jun 23 13:09:20 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7 2007/07/03 17:24:36 sniper Exp $
+dnl $Id: config.m4,v 1.8 2009/06/23 13:09:20 johannes Exp $
 dnl
 
 PHP_ARG_ENABLE(json, whether to enable JavaScript Object Serialization support,
@@ -10,5 +10,6 @@
   AC_HEADER_STDC
 
   PHP_NEW_EXTENSION(json, json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c, 
$ext_shared)
+  PHP_INSTALL_HEADERS([ext/json], [php_json.h])
   PHP_SUBST(JSON_SHARED_LIBADD)
 fi



-- 
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/json config.m4

2009-06-23 Thread Johannes Schlüter 
johannesTue Jun 23 13:09:34 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/json   config.m4 
  Log:
  The json header should be installed so other exts can use it
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.m4?r1=1.3.2.4r2=1.3.2.4.2.1diff_format=u
Index: php-src/ext/json/config.m4
diff -u php-src/ext/json/config.m4:1.3.2.4 
php-src/ext/json/config.m4:1.3.2.4.2.1
--- php-src/ext/json/config.m4:1.3.2.4  Tue Jul  3 17:25:33 2007
+++ php-src/ext/json/config.m4  Tue Jun 23 13:09:34 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.3.2.4 2007/07/03 17:25:33 sniper Exp $
+dnl $Id: config.m4,v 1.3.2.4.2.1 2009/06/23 13:09:34 johannes Exp $
 dnl
 
 PHP_ARG_ENABLE(json, whether to enable JavaScript Object Serialization support,
@@ -10,5 +10,6 @@
   AC_HEADER_STDC
 
   PHP_NEW_EXTENSION(json, json.c utf8_to_utf16.c utf8_decode.c JSON_parser.c, 
$ext_shared)
+  PHP_INSTALL_HEADERS([ext/json], [php_json.h])
   PHP_SUBST(JSON_SHARED_LIBADD)
 fi



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

[PHP-CVS] cvs: php-src /ext/mysqlnd config9.m4

2009-06-23 Thread Johannes Schlüter 
johannesTue Jun 23 13:19:22 2009 UTC

  Modified files:  
/php-src/ext/mysqlndconfig9.m4 
  Log:
  The experimental warning sohuld be in the configure output...
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.10 php-src/ext/mysqlnd/config9.m4:1.11
--- php-src/ext/mysqlnd/config9.m4:1.10 Tue Mar 17 10:04:57 2009
+++ php-src/ext/mysqlnd/config9.m4  Tue Jun 23 13:19:22 2009
@@ -1,11 +1,12 @@
 dnl
-dnl $Id: config9.m4,v 1.10 2009/03/17 10:04:57 johannes Exp $
+dnl $Id: config9.m4,v 1.11 2009/06/23 13:19:22 johannes Exp $
 dnl config.m4 for mysqlnd driver
 
 
 PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd,
 [  --enable-mysqlnd-threading
-MYSQLND: Enable threaded fetch. Note: This forces 
ZTS on!], no, no)
+EXPERIMENTAL: Enable mysqlnd threaded fetch.
+Note: This forces ZTS on!], no, no)
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
 if test $PHP_MYSQLND_ENABLED = yes; then
@@ -23,7 +24,7 @@
   dnl Windows uses config.w32 thus this code is safe for now
   if test $PHP_MYSQLND_THREADING = yes; then
 PHP_BUILD_THREAD_SAFE
-AC_DEFINE([MYSQLND_THREADED], 1, [EXPERIMENTAL: Use mysqlnd internal 
threading])
+AC_DEFINE([MYSQLND_THREADED], 1, [Use mysqlnd internal threading])
   fi
 
   dnl This creates a file so it has to be after above macros



-- 
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/mysqlnd config9.m4

2009-06-23 Thread Johannes Schlüter 
johannesTue Jun 23 13:19:28 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndconfig9.m4 
  Log:
  MFH The experimental warning sohuld be in the configure output...
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.3.2.9r2=1.3.2.10diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.3.2.9 
php-src/ext/mysqlnd/config9.m4:1.3.2.10
--- php-src/ext/mysqlnd/config9.m4:1.3.2.9  Tue Mar 17 10:05:19 2009
+++ php-src/ext/mysqlnd/config9.m4  Tue Jun 23 13:19:28 2009
@@ -1,11 +1,12 @@
 dnl
-dnl $Id: config9.m4,v 1.3.2.9 2009/03/17 10:05:19 johannes Exp $
+dnl $Id: config9.m4,v 1.3.2.10 2009/06/23 13:19:28 johannes Exp $
 dnl config.m4 for mysqlnd driver
 
 
 PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd,
 [  --enable-mysqlnd-threading
-MYSQLND: Enable threaded fetch. Note: This forces 
ZTS on!], no, no)
+EXPERIMENTAL: Enable mysqlnd threaded fetch.
+Note: This forces ZTS on!], no, no)
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
 if test $PHP_MYSQLND_ENABLED = yes; then
@@ -23,7 +24,7 @@
   dnl Windows uses config.w32 thus this code is safe for now
   if test $PHP_MYSQLND_THREADING = yes; then
 PHP_BUILD_THREAD_SAFE
-AC_DEFINE([MYSQLND_THREADED], 1, [EXPERIMENTAL: Use mysqlnd internal 
threading])
+AC_DEFINE([MYSQLND_THREADED], 1, [Use mysqlnd internal threading])
   fi
 
   dnl This creates a file so it has to be after above macros



-- 
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) / UPGRADING

2009-06-23 Thread Hannes Magnusson 
bjori   Tue Jun 23 13:37:35 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcUPGRADING 
  Log:
  better place for it
  
  
http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.17r2=1.1.2.3.2.1.2.18diff_format=u
Index: php-src/UPGRADING
diff -u php-src/UPGRADING:1.1.2.3.2.1.2.17 php-src/UPGRADING:1.1.2.3.2.1.2.18
--- php-src/UPGRADING:1.1.2.3.2.1.2.17  Tue Jun 23 13:33:26 2009
+++ php-src/UPGRADING   Tue Jun 23 13:37:35 2009
@@ -1,4 +1,4 @@
-$Id: UPGRADING,v 1.1.2.3.2.1.2.17 2009/06/23 13:33:26 bjori Exp $
+$Id: UPGRADING,v 1.1.2.3.2.1.2.18 2009/06/23 13:37:35 bjori Exp $
 
 UPGRADE NOTES - PHP 5.3
 
@@ -13,7 +13,6 @@
  b. no longer maintained
  c. with changed behaviour
  d. no longer possible to disable
- e. removed functionality
 8. Changes in SAPI support
 9. Changes in INI directives
 10. Syntax additions
@@ -165,6 +164,9 @@
 
  c. with changed behaviour
 
+- datetime: date/timefunctions will no longer use the TZ environment
+  variable to guess which timezone should be used.
+
 - hash: The SHA-224 hash algorithm is now supported.
 
 - oci8: Calling oci_close() on a persistent connection, or on a 
variable
@@ -188,11 +190,6 @@
 - Reflection
 - SPL
 
- e. removed behaviour
-
-- date/time functions will no longer use the TZ environment variable to
-  guess which timezone should be used.
-
 
 ==
 8. Changes in SAPI support



-- 
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) / UPGRADING

2009-06-23 Thread Hannes Magnusson 
bjori   Tue Jun 23 13:33:26 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcUPGRADING 
  Log:
  TZ is no longer used to guess the timezone
  
  
http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.16r2=1.1.2.3.2.1.2.17diff_format=u
Index: php-src/UPGRADING
diff -u php-src/UPGRADING:1.1.2.3.2.1.2.16 php-src/UPGRADING:1.1.2.3.2.1.2.17
--- php-src/UPGRADING:1.1.2.3.2.1.2.16  Tue Jun 23 11:13:05 2009
+++ php-src/UPGRADING   Tue Jun 23 13:33:26 2009
@@ -1,4 +1,4 @@
-$Id: UPGRADING,v 1.1.2.3.2.1.2.16 2009/06/23 11:13:05 bjori Exp $
+$Id: UPGRADING,v 1.1.2.3.2.1.2.17 2009/06/23 13:33:26 bjori Exp $
 
 UPGRADE NOTES - PHP 5.3
 
@@ -13,6 +13,7 @@
  b. no longer maintained
  c. with changed behaviour
  d. no longer possible to disable
+ e. removed functionality
 8. Changes in SAPI support
 9. Changes in INI directives
 10. Syntax additions
@@ -187,6 +188,12 @@
 - Reflection
 - SPL
 
+ e. removed behaviour
+
+- date/time functions will no longer use the TZ environment variable to
+  guess which timezone should be used.
+
+
 ==
 8. Changes in SAPI support
 ==



-- 
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/libxml libxml.c

2009-06-23 Thread Hannes Magnusson 
bjori   Tue Jun 23 13:44:24 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/libxml libxml.c 
  Log:
  MFH: Fix arginfo for libxml_disable_entity_loader() and 
libxml_use_internal_errors()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.15.2.12r2=1.32.2.7.2.15.2.13diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.12 
php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.13
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.12  Tue Jun 23 10:50:09 2009
+++ php-src/ext/libxml/libxml.c Tue Jun 23 13:44:24 2009
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: libxml.c,v 1.32.2.7.2.15.2.12 2009/06/23 10:50:09 rrichards Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.15.2.13 2009/06/23 13:44:24 bjori Exp $ */
 
 #define IS_EXT_MODULE
 
@@ -92,7 +92,7 @@
ZEND_ARG_INFO(0, context)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_libxml_use_internal_errors, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_libxml_use_internal_errors, 0, 0, 0)
ZEND_ARG_INFO(0, use_errors)
 ZEND_END_ARG_INFO()
 
@@ -105,7 +105,7 @@
 ZEND_BEGIN_ARG_INFO(arginfo_libxml_clear_errors, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_libxml_disable_entity_loader, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_libxml_disable_entity_loader, 0, 0, 0)
ZEND_ARG_INFO(0, disable)
 ZEND_END_ARG_INFO()
 



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

[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_result.c

2009-06-23 Thread David Soria Parra 
dsp Tue Jun 23 14:14:32 2009 UTC

  Modified files:  
/php-src/ext/mysqlndmysqlnd_result.c 
  Log:
  Fix bug #48644 mysqlnd does not compile with '--enable-mysqlnd-threading'
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.35 
php-src/ext/mysqlnd/mysqlnd_result.c:1.36
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.35   Tue Jun 16 13:06:45 2009
+++ php-src/ext/mysqlnd/mysqlnd_result.cTue Jun 23 14:14:32 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd_result.c,v 1.35 2009/06/16 13:06:45 andrey Exp $ */
+/* $Id: mysqlnd_result.c,v 1.36 2009/06/23 14:14:32 dsp Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -354,7 +354,7 @@
 #endif
pefree(current_row, set-persistent);
}
-   current_buffer-free_chunk(current_buffer, TRUE TSRMLS_CC);
+   mysqlnd_mempool_free_chunk(current_buffer, TRUE TSRMLS_CC);
}
DBG_INF(Freeing data  row_buffer);
pefree(set-data, set-persistent);



-- 
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/mysqlnd mysqlnd_result.c

2009-06-23 Thread David Soria Parra 
dsp Tue Jun 23 14:15:28 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_result.c 
  Log:
  MFH: Fix bug #48644 mysqlnd does not compile with '--enable-mysqlnd-threading'
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_result.c?r1=1.4.2.32r2=1.4.2.33diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_result.c
diff -u php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.32 
php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.33
--- php-src/ext/mysqlnd/mysqlnd_result.c:1.4.2.32   Thu Jun 18 15:07:23 2009
+++ php-src/ext/mysqlnd/mysqlnd_result.cTue Jun 23 14:15:28 2009
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: mysqlnd_result.c,v 1.4.2.32 2009/06/18 15:07:23 johannes Exp $ */
+/* $Id: mysqlnd_result.c,v 1.4.2.33 2009/06/23 14:15:28 dsp Exp $ */
 #include php.h
 #include mysqlnd.h
 #include mysqlnd_wireprotocol.h
@@ -360,7 +360,7 @@
 #endif
pefree(current_row, set-persistent);
}
-   current_buffer-free_chunk(current_buffer, TRUE TSRMLS_CC);
+   mysqlnd_mempool_free_chunk(current_buffer, TRUE TSRMLS_CC);
}
DBG_INF(Freeing data  row_buffer);
pefree(set-data, set-persistent);



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

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

2009-06-23 Thread Johannes Schlüter 
johannesTue Jun 23 18:14:03 2009 UTC

  Modified files:  
/php-src/ext/splphp_spl.h 
  Log:
  Fix build problem (Kalle)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.h?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/spl/php_spl.h
diff -u php-src/ext/spl/php_spl.h:1.31 php-src/ext/spl/php_spl.h:1.32
--- php-src/ext/spl/php_spl.h:1.31  Tue Mar 10 23:39:38 2009
+++ php-src/ext/spl/php_spl.h   Tue Jun 23 18:14:03 2009
@@ -21,7 +21,9 @@
 
 #include php.h
 #if defined(PHP_WIN32)
-#include win32/php_stdint.h
+# include win32/php_stdint.h
+#elif defined(HAVE_STDINT_H)
+# include stdint.h
 #endif
 #include stdarg.h
 



-- 
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 php_spl.h

2009-06-23 Thread Johannes Schlüter 
johannesTue Jun 23 18:14:27 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/splphp_spl.h 
  Log:
  MFH: Fix build problem (Kalle)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.h?r1=1.17.2.1.2.3.2.8r2=1.17.2.1.2.3.2.9diff_format=u
Index: php-src/ext/spl/php_spl.h
diff -u php-src/ext/spl/php_spl.h:1.17.2.1.2.3.2.8 
php-src/ext/spl/php_spl.h:1.17.2.1.2.3.2.9
--- php-src/ext/spl/php_spl.h:1.17.2.1.2.3.2.8  Tue Jan 27 21:53:49 2009
+++ php-src/ext/spl/php_spl.h   Tue Jun 23 18:14:27 2009
@@ -21,7 +21,9 @@
 
 #include php.h
 #if defined(PHP_WIN32)
-#include win32/php_stdint.h
+# include win32/php_stdint.h
+#elif defined(HAVE_STDINT_H)
+# include stdint.h
 #endif
 #include stdarg.h
 



-- 
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) / UPGRADING

2009-06-23 Thread Hannes Magnusson 
bjori   Tue Jun 23 19:40:31 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-srcUPGRADING 
  Log:
  Missing items
  
  
http://cvs.php.net/viewvc.cgi/php-src/UPGRADING?r1=1.1.2.3.2.1.2.18r2=1.1.2.3.2.1.2.19diff_format=u
Index: php-src/UPGRADING
diff -u php-src/UPGRADING:1.1.2.3.2.1.2.18 php-src/UPGRADING:1.1.2.3.2.1.2.19
--- php-src/UPGRADING:1.1.2.3.2.1.2.18  Tue Jun 23 13:37:35 2009
+++ php-src/UPGRADING   Tue Jun 23 19:40:31 2009
@@ -1,4 +1,4 @@
-$Id: UPGRADING,v 1.1.2.3.2.1.2.18 2009/06/23 13:37:35 bjori Exp $
+$Id: UPGRADING,v 1.1.2.3.2.1.2.19 2009/06/23 19:40:31 bjori Exp $
 
 UPGRADE NOTES - PHP 5.3
 
@@ -79,12 +79,15 @@
  fgetcsv(): escape.
  ini_get_all(): details.
  json_encode(): options.
+ json_decode(): depth.
  nl2br(): is_xhtml.
  parse_ini_file(): scanner_mode.
  round(): mode.
  stream_context_create(): params.
  strstr(), stristr(): before_needle.
 
+- And new mode options for fopen, 'n' (O_NONBLOCK)
+
 - The new mysqlnd library necessitates using MySQL's newer 41 byte password 
format.
   Continued use of the old 16 byte passwords will cause mysql_connect() to 
produce
   the following error message: mysqlnd cannot connect to MySQL 4.1+ using old
@@ -312,7 +315,11 @@
- glob:// stream wrapper
- phar:// stream wrapper for accessing phar archives
 
- d. New functions
+ d. New stream filters
+
+   - dechunk (HTTP/1.1 chunked transfer encoding)
+
+ e. New functions
 
- Core:gc_collect_cycles()
   gc_enabled()
@@ -337,6 +344,9 @@
- INI: parse_ini_string()
- GMP: gmp_testbit()
- Hash:hash_copy()
+   - IMAP:imap_gc()
+  imap_utf8_to_mutf7()
+  imap_mutf7_to_utf8()
- JSON:json_last_error()
- libxml:  libxml_disable_entity_loader
- MySQLi:  mysqli_fetch_all()
@@ -355,7 +365,7 @@
- Streams: stream_supports_lock()
   stream_context_set_default()
 
- e. New global constants
+ f. New global constants
 
- Core:E_DEPRECATED
   E_USER_DEPRECATED
@@ -374,6 +384,7 @@
   PHP_WINDOWS_NT_WORKSTATION
- INI: INI_SCANNER_NORMAL
   INI_SCANNER_RAW
+   - cURL CURLOPT_PROGRESSFUNCTION
- GD:  IMG_FILTER_PIXELATE
- JSON:JSON_ERROR_NONE
   JSON_ERROR_DEPTH
@@ -435,7 +446,7 @@
   BUS_ADRERR
   BUS_OBJERR
 
- f. New classes
+ g. New classes
 
- Date:DateInterval
   DatePeriod
@@ -456,7 +467,7 @@
   RecursiveTreeIterator
   MultipleIterator
 
- g. New methods
+ h. New methods
 
- Date: DateTime::diff()
DateTime::add()
@@ -473,7 +484,7 @@
ReflectionClass::getShortName()
- XSL:  XSLTProcessor::setProfiling()
 
- h. New class constants
+ i. New class constants
 
- PDO_Firebird: PDO::FB_ATTR_DATE_FORMAT
PDO::FB_ATTR_TIME_FORMAT



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

[PHP-CVS] cvs: php-src /ext/posix posix.c

2009-06-23 Thread Gwynne Raskind 
gwynne  Tue Jun 23 21:11:12 2009 UTC

  Modified files:  
/php-src/ext/posix  posix.c 
  Log:
  add S_IRWXU and friends as defined POSIX constants
  
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/posix.c?r1=1.109r2=1.110diff_format=u
Index: php-src/ext/posix/posix.c
diff -u php-src/ext/posix/posix.c:1.109 php-src/ext/posix/posix.c:1.110
--- php-src/ext/posix/posix.c:1.109 Sat Jun  6 02:40:14 2009
+++ php-src/ext/posix/posix.c   Tue Jun 23 21:11:12 2009
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: posix.c,v 1.109 2009/06/06 02:40:14 mattwil Exp $ */
+/* $Id: posix.c,v 1.110 2009/06/23 21:11:12 gwynne Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -310,7 +310,7 @@
 static PHP_MINFO_FUNCTION(posix)
 {
php_info_print_table_start();
-   php_info_print_table_row(2, Revision, $Revision: 1.109 $);
+   php_info_print_table_row(2, Revision, $Revision: 1.110 $);
php_info_print_table_end();
 }
 /* }}} */
@@ -332,6 +332,12 @@
 #ifdef S_IFREG
REGISTER_LONG_CONSTANT(POSIX_S_IFREG, S_IFREG, CONST_CS | 
CONST_PERSISTENT);
 #endif
+#ifdef S_IFDIR
+   REGISTER_LONG_CONSTANT(POSIX_S_IFDIR, S_IFDIR, CONST_CS | 
CONST_PERSISTENT);
+#endif
+#ifdef S_IFLNK
+   REGISTER_LONG_CONSTANT(POSIX_S_IFLNK, S_IFLNK, CONST_CS | 
CONST_PERSISTENT);
+#endif
 #ifdef S_IFCHR
REGISTER_LONG_CONSTANT(POSIX_S_IFCHR, S_IFCHR, CONST_CS | 
CONST_PERSISTENT);
 #endif
@@ -344,7 +350,35 @@
 #ifdef S_IFSOCK
REGISTER_LONG_CONSTANT(POSIX_S_IFSOCK, S_IFSOCK, CONST_CS | 
CONST_PERSISTENT);
 #endif
-
+#ifdef S_IFWHT
+   REGISTER_LONG_CONSTANT(POSIX_S_IFWHT, S_IFWHT, CONST_CS | 
CONST_PERSISTENT);
+#endif
+#ifdef S_IRWXU
+   REGISTER_LONG_CONSTANT(POSIX_S_IRWXU, S_IRWXU, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IRUSR, S_IRUSR, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IWUSR, S_IWUSR, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IXUSR, S_IXUSR, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IRWXG, S_IRWXG, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IRGRP, S_IRGRP, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IWGRP, S_IWGRP, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IXGRP, S_IXGRP, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IRWXO, S_IRWXO, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IROTH, S_IROTH, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IWOTH, S_IWOTH, CONST_CS | 
CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(POSIX_S_IXOTH, S_IXOTH, CONST_CS | 
CONST_PERSISTENT);
+#endif
+#ifdef S_ISUID
+   REGISTER_LONG_CONSTANT(POSIX_S_ISUID, S_ISUID, CONST_CS | 
CONST_PERSISTENT);
+#endif
+#ifdef S_ISGID
+   REGISTER_LONG_CONSTANT(POSIX_S_ISGID, S_ISGID, CONST_CS | 
CONST_PERSISTENT);
+#endif
+#ifdef S_ISVTX
+   REGISTER_LONG_CONSTANT(POSIX_S_ISVTX, S_ISVTX, CONST_CS | 
CONST_PERSISTENT);
+#endif
+#ifdef S_ISTXT
+   REGISTER_LONG_CONSTANT(POSIX_S_ISTXT, S_ISTXT, CONST_CS | 
CONST_PERSISTENT);
+#endif
return SUCCESS;
 }
 /* }}} */



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

[PHP-CVS] cvs: php-src /ext/standard/tests/strings parse_str_basic1.phpt parse_str_basic2.phpt parse_str_basic3.phpt parse_str_basic4.phpt parse_str_error1.phpt

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 22:39:43 2009 UTC

  Added files: 
/php-src/ext/standard/tests/strings parse_str_basic4.phpt 
parse_str_error1.phpt 
parse_str_basic2.phpt 
parse_str_basic3.phpt 
parse_str_basic1.phpt 
  Log:
  New basic parse_str() tests. Tested on Windows,Linux and Lnux 64 bit. Some 
tests fail on PHP 6 (tagged with XFAIL) due to bug 48658
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic4.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/parse_str_basic4.phpt
+++ php-src/ext/standard/tests/strings/parse_str_basic4.phpt
--TEST--
Test parse_str() function : test with badly formed strings
--XFAIL--
Bug 48658: Test currently fails as parse_str() api insists that the optional 
reult array 
is pre-defined. php.net bugzilla 
--FILE--
?php
/* Prototype  : void parse_str  ( string $str  [, array $arr  ] )
 * Description: Parses the string into variables
 * Source code: ext/standard/string.c
*/

echo \nTest string with badly formed strings\n;
$str = arr[1=sidarr[4][2=fred;
var_dump(parse_str($str, $res));
var_dump($res);

$str = arr1]=sidarr[4]2]=fred;
var_dump(parse_str($str, $res));
var_dump($res);

$str = arr[one=sidarr[4][two=fred;
var_dump(parse_str($str, $res));
var_dump($res);

echo \nTest string with non-binary safe name\n;
$str = arr.test[1]=sidarr test[4][two]=fred;
var_dump(parse_str($str, $res));
var_dump($res);
?
===DONE===
--EXPECTF--
Test string with badly formed strings
NULL
array(2) {
  [uarr_1]=
  unicode(3) sid
  [uarr]=
  array(1) {
[4]=
unicode(4) fred
  }
}
NULL
array(2) {
  [uarr1]]=
  unicode(3) sid
  [uarr]=
  array(1) {
[4]=
unicode(4) fred
  }
}
NULL
array(2) {
  [uarr_one]=
  unicode(3) sid
  [uarr]=
  array(1) {
[4]=
unicode(4) fred
  }
}

Test string with non-binary safe name
NULL
array(1) {
  [uarr_test]=
  array(2) {
[1]=
unicode(3) sid
[4]=
array(1) {
  [utwo]=
  unicode(4) fred
}
  }
}
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_error1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/parse_str_error1.phpt
+++ php-src/ext/standard/tests/strings/parse_str_error1.phpt
--TEST--
Test parse_str() function : non-default arg_separator.input specified
--INI--
arg_separator.input = / 
--FILE--
?php
/* Prototype  : void parse_str  ( string $str  [, array $arr  ] )
 * Description: Parses the string into variables
 * Source code: ext/standard/string.c
*/

echo *** Testing parse_str() : error conditions ***\n;

echo \n-- Testing htmlentities() function with less than expected no. of 
arguments --\n;
parse_str();
echo \n-- Testing htmlentities() function with more than expected no. of 
arguments --\n;
$s1 = first=val1second=val2third=val3;
parse_str($s1, $res_array, true); 

?
===DONE===
--EXPECTF--
*** Testing parse_str() : error conditions ***

-- Testing htmlentities() function with less than expected no. of arguments --

Warning: parse_str() expects at least 1 parameter, 0 given in %s on line %d

-- Testing htmlentities() function with more than expected no. of arguments --

Warning: parse_str() expects at most 2 parameters, 3 given in %s on line %d
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic2.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/parse_str_basic2.phpt
+++ php-src/ext/standard/tests/strings/parse_str_basic2.phpt
--TEST--
Test parse_str() function : non-default arg_separator.input specified
--INI--
arg_separator.input = / 
--FILE--
?php
/* Prototype  : void parse_str  ( string $str  [, array $arr  ] )
 * Description: Parses the string into variables
 * Source code: ext/standard/string.c
*/

echo *** Testing parse_str() : non-default arg_separator.input specified 
***\n;

$s1 = first=val1/second=val2/third=val3;
var_dump(parse_str($s1));
var_dump($first, $second, $third);

?
===DONE===
--EXPECTF--
*** Testing parse_str() : non-default arg_separator.input specified ***
NULL
unicode(4) val1
unicode(4) val2
unicode(4) val3
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic3.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/parse_str_basic3.phpt
+++ php-src/ext/standard/tests/strings/parse_str_basic3.phpt
--TEST--
Test parse_str() function : Basic functionality
--XFAIL--
Bug 48658: Test currently fails as parse_str() api insists that the optional 
reult array 
is pre-defined. php.net bugzilla 
--FILE--
?php
/* Prototype  : void parse_str  ( string $str  [, array $arr  ] )
 * Description: Parses the string into variables
 * Source code: ext/standard/string.c
*/
echo *** Testing parse_str() : basic functionality ***\n;

echo \nTest string with array values\n;
$s1 = first=abca[]=123a[]=falseb[]=strc[]=3.5a[]=last;

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings parse_str_basic1.phpt parse_str_basic2.phpt parse_str_basic3.phpt parse_str_basic4.phpt parse_str_error1.phpt

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 22:39:44 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings parse_str_basic4.phpt 
parse_str_error1.phpt 
parse_str_basic1.phpt 
parse_str_basic2.phpt 
parse_str_basic3.phpt 
  Log:
  New basic parse_str() tests. Tested on Windows,Linux and Lnux 64 bit. Some 
tests fail on PHP 6 (tagged with XFAIL) due to bug 48658
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic4.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/parse_str_basic4.phpt
+++ php-src/ext/standard/tests/strings/parse_str_basic4.phpt
--TEST--
Test parse_str() function : test with badly formed strings
--XFAIL--
Bug 48658: Test currently fails as parse_str() api insists that the optional 
reult array 
is pre-defined. php.net bugzilla 
--FILE--
?php
/* Prototype  : void parse_str  ( string $str  [, array $arr  ] )
 * Description: Parses the string into variables
 * Source code: ext/standard/string.c
*/

echo \nTest string with badly formed strings\n;
$str = arr[1=sidarr[4][2=fred;
var_dump(parse_str($str, $res));
var_dump($res);

$str = arr1]=sidarr[4]2]=fred;
var_dump(parse_str($str, $res));
var_dump($res);

$str = arr[one=sidarr[4][two=fred;
var_dump(parse_str($str, $res));
var_dump($res);

echo \nTest string with non-binary safe name\n;
$str = arr.test[1]=sidarr test[4][two]=fred;
var_dump(parse_str($str, $res));
var_dump($res);
?
===DONE===
--EXPECTF--
Test string with badly formed strings
NULL
array(2) {
  [uarr_1]=
  unicode(3) sid
  [uarr]=
  array(1) {
[4]=
unicode(4) fred
  }
}
NULL
array(2) {
  [uarr1]]=
  unicode(3) sid
  [uarr]=
  array(1) {
[4]=
unicode(4) fred
  }
}
NULL
array(2) {
  [uarr_one]=
  unicode(3) sid
  [uarr]=
  array(1) {
[4]=
unicode(4) fred
  }
}

Test string with non-binary safe name
NULL
array(1) {
  [uarr_test]=
  array(2) {
[1]=
unicode(3) sid
[4]=
array(1) {
  [utwo]=
  unicode(4) fred
}
  }
}
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_error1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/parse_str_error1.phpt
+++ php-src/ext/standard/tests/strings/parse_str_error1.phpt
--TEST--
Test parse_str() function : non-default arg_separator.input specified
--INI--
arg_separator.input = / 
--FILE--
?php
/* Prototype  : void parse_str  ( string $str  [, array $arr  ] )
 * Description: Parses the string into variables
 * Source code: ext/standard/string.c
*/

echo *** Testing parse_str() : error conditions ***\n;

echo \n-- Testing htmlentities() function with less than expected no. of 
arguments --\n;
parse_str();
echo \n-- Testing htmlentities() function with more than expected no. of 
arguments --\n;
$s1 = first=val1second=val2third=val3;
parse_str($s1, $res_array, true); 

?
===DONE===
--EXPECTF--
*** Testing parse_str() : error conditions ***

-- Testing htmlentities() function with less than expected no. of arguments --

Warning: parse_str() expects at least 1 parameter, 0 given in %s on line %d

-- Testing htmlentities() function with more than expected no. of arguments --

Warning: parse_str() expects at most 2 parameters, 3 given in %s on line %d
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/parse_str_basic1.phpt
+++ php-src/ext/standard/tests/strings/parse_str_basic1.phpt
--TEST--
Test parse_str() function : basic functionality 
--XFAIL--
Bug 48658: Test currently fails as parse_str() api insists that the optional 
reult array 
is pre-defined. 
--FILE--
?php

/* Prototype  : void parse_str  ( string $str  [, array $arr  ] )
 * Description: Parses the string into variables
 * Source code: ext/standard/string.c
*/

echo *** Testing parse_str() : basic functionality ***\n;

echo Basic test WITHOUT result arg\n;
$s1 = first=val1second=val2third=val3;
var_dump(parse_str($s1));
var_dump($first, $second, $third);

echo \nBasic test WITH undefined var for result arg\n;
$s1 = first=val1second=val2third=val3;
var_dump(parse_str($s1, $res1));
var_dump($res1);

echo \nBasic test WITH existing non-array var for result arg\n;
$res2 =99;
$s1 = first=val1second=val2third=val3;
var_dump(parse_str($s1, $res2));
var_dump($res2);

echo \nBasic test with an existing array as results array\n;
$res3_array = array(1,2,3,4);
var_dump(parse_str($s1, $res3_array));
var_dump($res3_array); 

?
===DONE===
--EXPECTF--
*** Testing parse_str() : basic functionality ***
Basic test WITHOUT result arg
NULL
unicode(4) val1
unicode(4) val2
unicode(4) val3

Basic test WITH undefined var for result arg
NULL
array(3) {
  [ufirst]=
  unicode(4) val1
  [usecond]=
  unicode(4) val2
  [uthird]=
  unicode(4) val3
}

Basic test WITH existing

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings parse_str_basic1.phpt parse_str_basic2.phpt parse_str_basic3.phpt parse_str_basic4.phpt parse_str_error1.phpt

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 22:39:46 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings parse_str_basic3.phpt 
parse_str_basic1.phpt 
parse_str_basic2.phpt 
parse_str_error1.phpt 
parse_str_basic4.phpt 
  Log:
  New basic parse_str() tests. Tested on Windows,Linux and Lnux 64 bit. Some 
tests fail on PHP 6 (tagged with XFAIL) due to bug 48658
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/parse_str_basic3.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/parse_str_basic3.phpt
+++ php-src/ext/standard/tests/strings/parse_str_basic3.phpt
--TEST--
Test parse_str() function : Basic functionality
--XFAIL--
Bug 48658: Test currently fails as parse_str() api insists that the optional 
reult array 
is pre-defined. php.net bugzilla 
--FILE--
?php
/* Prototype  : void parse_str  ( string $str  [, array $arr  ] )
 * Description: Parses the string into variables
 * Source code: ext/standard/string.c
*/
echo *** Testing parse_str() : basic functionality ***\n;

echo \nTest string with array values\n;
$s1 = first=abca[]=123a[]=falseb[]=strc[]=3.5a[]=last;
var_dump(parse_str($s1));
var_dump($first, $a, $b, $c); 

echo \nTest string with array values and results array\n;
$s1 = first=abca[]=123a[]=falseb[]=strc[]=3.5a[]=last;
$res3_array= array();
var_dump(parse_str($s1, $res3_array));
var_dump($res3_array); 

echo \nTest string containing numerical array keys\n;
$str = arr[1]=sidarr[4]=bill;
$res3= array();
var_dump(parse_str($str, $res));
var_dump($res);

echo \nTest string containing associative keys\n;
$str = arr[first]=sidarr[forth]=bill;
$res3_array= array();
var_dump(parse_str($str, $res));
var_dump($res);

echo \nTest string with array values with same name as existing variable\n;
$a = ;
$s1 = a[]=123a[]=falsea[]=last;
var_dump(parse_str($s1));
var_dump($a);

echo \nTest string with non-array value with same name as existing array 
variable\n;
$a = array(10,11,12,13);
$s1 = a=999;
parse_str($s1);
var_dump($a);

echo \nTest string with encoded data\n;
$s1 = a=%3c%3d%3d%20%20foo+bar++%3d%3d%3eb=%23%23%23Hello+World%23%23%23;
parse_str($s1);
var_dump($a, $b);

echo \nTest string with single quotes characters\n;
$s1 = firstname=Billsurname=O%27Reilly;
var_dump(parse_str($s1));
var_dump($firstname, $surname);

echo \nTest string with backslash characters\n;
$s1 = sum=10%5c2%3d5;
var_dump(parse_str($s1));
var_dump($sum);

echo \nTest string with double quotes data\n;
$s1 = str=A+string+with+%22quoted%22+strings;
var_dump(parse_str($s1));
var_dump($str);

echo \nTest string with nulls\n;
$s1 = str=A%20string%20with%20containing%20%00%00%00%20nulls;
var_dump(parse_str($s1));
var_dump($str);

echo \nTest string with 2-dim array with numeric keys\n;
$str = arr[3][4]=sidarr[3][6]=fred;
$res3_array= array();
var_dump(parse_str($str, $res));
var_dump($res);

echo \nTest string with 2-dim array with null keys\n;
$str = arr[][]=sidarr[][]=fred;
$res3_array= array();
var_dump(parse_str($str, $res));
var_dump($res);

echo \nTest string with 2-dim array with non-numeric keys\n;
$str = arr[one][four]=sidarr[three][six]=fred;
$res3_array= array();
var_dump(parse_str($str, $res));
var_dump($res);

echo \nTest string with 3-dim array with numeric keys\n;
$str = arr[1][2][3]=sidarr[1][2][6]=fred;
$res3_array= array();
var_dump(parse_str($str, $res));
var_dump($res);

?
===DONE===
--EXPECTF--
*** Testing parse_str() : basic functionality ***

Test string with array values
NULL
unicode(3) abc
array(3) {
  [0]=
  unicode(3) 123
  [1]=
  unicode(5) false
  [2]=
  unicode(4) last
}
array(1) {
  [0]=
  unicode(3) str
}
array(1) {
  [0]=
  unicode(3) 3.5
}

Test string with array values and results array
NULL
array(4) {
  [ufirst]=
  unicode(3) abc
  [ua]=
  array(3) {
[0]=
unicode(3) 123
[1]=
unicode(5) false
[2]=
unicode(4) last
  }
  [ub]=
  array(1) {
[0]=
unicode(3) str
  }
  [uc]=
  array(1) {
[0]=
unicode(3) 3.5
  }
}

Test string containing numerical array keys
NULL
array(1) {
  [uarr]=
  array(2) {
[1]=
unicode(3) sid
[4]=
unicode(4) bill
  }
}

Test string containing associative keys
NULL
array(1) {
  [uarr]=
  array(2) {
[first]=
unicode(3) sid
[forth]=
unicode(4) bill
  }
}

Test string with array values with same name as existing variable
NULL
array(3) {
  [0]=
  unicode(3) 123
  [1]=
  unicode(5) false
  [2]=
  unicode(4) last
}

Test string with non-array value with same name as existing array variable
unicode(3) 999

Test string with encoded data
unicode(17) ==  foo bar  ==
unicode(17) ###Hello World###

Test string with single quotes characters
NULL
unicode(4) Bill
unicode(9) O\'Reilly

Test string with backslash characters
NULL
unicode(7) 10\\2=5

Test string with double quotes data
NULL
unicode(32) A string

[PHP-CVS] cvs: php-src /ext/standard/tests/strings htmlentities09.phpt htmlentities16.phpt htmlspecialchars_basic.phpt htmlspecialchars_decode_variation1.phpt htmlspecialchars_decode_variation6.phpt

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 22:45:30 2009 UTC

  Added files: 
/php-src/ext/standard/tests/strings htmlspecialchars_basic.phpt 

  Modified files:  
/php-src/ext/standard/tests/strings htmlentities16.phpt 
htmlentities09.phpt 
htmlspecialchars_decode_variation1.phpt 
htmlspecialchars_decode_variation6.phpt 
  Log:
  New and fixed html tests. Tested in Windows, Linux and Linux 64.
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities16.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities16.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities16.phpt:1.5 
php-src/ext/standard/tests/strings/htmlentities16.phpt:1.6
--- php-src/ext/standard/tests/strings/htmlentities16.phpt:1.5  Wed Apr 30 
16:30:44 2003
+++ php-src/ext/standard/tests/strings/htmlentities16.phpt  Tue Jun 23 
22:45:30 2009
@@ -13,9 +13,12 @@
 --FILE--
 ?php
 mb_internal_encoding('cp1251');
-$str = \x88\xa9\xf0\xee\xf1\xea\xee\xf8\xed\xfb\xe9;
-var_dump($str, htmlentities($str, ENT_QUOTES, ''));
+$str = b\x88\xa9\xf0\xee\xf1\xea\xee\xf8\xed\xfb\xe9;
+var_dump(bin2hex($str));
+var_dump(htmlentities($str, ENT_QUOTES, ''));
 ?
+===DONE===
 --EXPECT--
-string(11) ˆ©ðîñêîøíûé
+unicode(22) 88a9f0eef1eaeef8edfbe9
 string(75) 
euro;copy;#1088;#1086;#1089;#1082;#1086;#1096;#1085;#1099;#1081;
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities09.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities09.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities09.phpt:1.3 
php-src/ext/standard/tests/strings/htmlentities09.phpt:1.4
--- php-src/ext/standard/tests/strings/htmlentities09.phpt:1.3  Fri Nov  8 
01:12:03 2002
+++ php-src/ext/standard/tests/strings/htmlentities09.phpt  Tue Jun 23 
22:45:30 2009
@@ -16,8 +16,10 @@
 ?php
mb_internal_encoding('Shift_JIS');
print mb_internal_encoding().\n;
-   var_dump(htmlentities(\x81\x41\x81\x42\x81\x43, ENT_QUOTES, ''));
+   var_dump(bin2hex((binary)htmlentities(\x81\x41\x81\x42\x81\x43, 
ENT_QUOTES, '')));
 ?
+===DONE===
 --EXPECT--
 SJIS
-string(6) ABC
+unicode(12) 814181428143
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt?r1=1.3r2=1.4diff_format=u
Index: 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
diff -u 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.3 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.4
--- 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.3  
Tue May 27 10:50:45 2008
+++ php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt  
Tue Jun 23 22:45:30 2009
@@ -31,51 +31,51 @@
 //array of values to iterate over
 $values = array(
 
-  // int data
-  0,
-  1,
-  12345,
-  -2345,
-
-  // float data
-  10.5,
-  -10.5,
-  10.5e10,
-  10.6E-10,
-  .5,
-
-  // array data
-  array(),
-  array(0),
-  array(1),
-  array(1, 2),
-  array('color' = 'red', 'item' = 'pen'),
-
-  // null data
-  NULL,
-  null,
-
-  // boolean data
-  true,
-  false,
-  TRUE,
-  FALSE,
-
-  // empty data
-  ,
-  '',
-
-  // object data
-  new classA(),
-
-  // undefined data
-  @$undefined_var,
-
-  // unset data
-  @$unset_var,
-
-  //resource
-  $file_handle
+ // int data
+/*1*/ 0,
+ 1,
+ 12345,
+ -2345,
+   
+ // float data
+/*5*/ 10.5,
+ -10.5,
+ 10.1234567e10,
+ 10.7654321E-10,
+ .5,
+   
+ // array data
+/*10*/array(),
+ array(0),
+ array(1),
+ array(1, 2),
+ array('color' = 'red', 'item' = 'pen'),
+   
+ // null data
+/*15*/NULL,
+ null,
+   
+ // boolean data
+/*17*/true,
+ false,
+ TRUE,
+ FALSE,
+   
+ // empty data
+/*21*/,
+ '',
+   
+ // object data
+/*23*/new classA(),
+   
+ // undefined data
+/*24*/@$undefined_var,
+   
+ // unset data
+/*25*/@$unset_var,
+   
+ //resource
+/*26*/$file_handle
 );
 
 // loop through each element of the array for string
@@ -89,8 +89,8 @@
 // close the file resource used
 fclose($file_handle);
 
-echo Done;
 ?
+===DONE===
 --EXPECTF--
 *** Testing htmlspecialchars_decode() : usage variations ***
 -- Iterator 1 --
@@ -106,9 +106,9 @@
 -- Iterator 6 --
 unicode(5) -10.5
 -- Iterator 7 --
-unicode(12) 1050
+unicode(12)

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings htmlentities09.phpt htmlentities16.phpt htmlspecialchars_basic.phpt htmlspecialchars_decode_variation1.phpt htmlspecialchars_decode_variatio

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 22:45:32 2009 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings htmlspecialchars_basic.phpt 

  Modified files:  
/php-src/ext/standard/tests/strings 
htmlspecialchars_decode_variation6.phpt 
htmlspecialchars_decode_variation1.phpt 
htmlentities09.phpt 
htmlentities16.phpt 
  Log:
  New and fixed html tests. Tested in Windows, Linux and Linux 64.
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
diff -u 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.2.2.2
 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.2.2.3
--- 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.2.2.2
  Sat Sep 29 16:51:42 2007
+++ php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt  
Tue Jun 23 22:45:31 2009
@@ -40,8 +40,8 @@
   // float data
   10.5,
   -10.5,
-  10.5e10,
-  10.6E-10,
+  10.1234567e10,
+  10.7654321E-10,
   .5,
 
   // array data
@@ -89,8 +89,8 @@
 // close the file resource used
 fclose($file_handle);
 
-echo Done;
 ?
+===DONE===
 --EXPECTF--
 *** Testing htmlspecialchars_decode() : usage variations ***
 -- Iterator 1 --
@@ -106,9 +106,9 @@
 -- Iterator 6 --
 string(5) -10.5
 -- Iterator 7 --
-string(12) 1050
+string(12) 101234567000
 -- Iterator 8 --
-string(7) 1.06E-9
+string(13) 1.07654321E-9
 -- Iterator 9 --
 string(3) 0.5
 -- Iterator 10 --
@@ -157,4 +157,5 @@
 
 Warning: htmlspecialchars_decode() expects parameter 1 to be string, resource 
given in %s on line %d
 NULL
-Done
+===DONE===
+   
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities09.phpt?r1=1.3r2=1.3.22.1diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities09.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities09.phpt:1.3 
php-src/ext/standard/tests/strings/htmlentities09.phpt:1.3.22.1
--- php-src/ext/standard/tests/strings/htmlentities09.phpt:1.3  Fri Nov  8 
01:12:03 2002
+++ php-src/ext/standard/tests/strings/htmlentities09.phpt  Tue Jun 23 
22:45:31 2009
@@ -16,8 +16,10 @@
 ?php
mb_internal_encoding('Shift_JIS');
print mb_internal_encoding().\n;
-   var_dump(htmlentities(\x81\x41\x81\x42\x81\x43, ENT_QUOTES, ''));
+   var_dump(bin2hex(htmlentities(\x81\x41\x81\x42\x81\x43, ENT_QUOTES, 
'')));
 ?
+===DONE===
 --EXPECT--
 SJIS
-string(6) ABC
+string(12) 814181428143
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities16.phpt?r1=1.5r2=1.5.8.1diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities16.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities16.phpt:1.5 
php-src/ext/standard/tests/strings/htmlentities16.phpt:1.5.8.1
--- php-src/ext/standard/tests/strings/htmlentities16.phpt:1.5  Wed Apr 30 
16:30:44 2003
+++ php-src/ext/standard/tests/strings/htmlentities16.phpt  Tue Jun 23 
22:45:31 2009
@@ -14,8 +14,10 @@
 ?php
 mb_internal_encoding('cp1251');
 $str = \x88\xa9\xf0\xee\xf1\xea\xee\xf8\xed\xfb\xe9;
-var_dump($str, htmlentities($str, ENT_QUOTES, ''));
+var_dump(bin2hex($str), htmlentities($str, ENT_QUOTES, ''));
 ?
+===DONE===
 --EXPECT--
-string(11) ˆ©ðîñêîøíûé
+string(22) 88a9f0eef1eaeef8edfbe9
 string(75) 
euro;copy;#1088;#1086;#1089;#1082;#1086;#1096;#1085;#1099;#1081;
+===DONE===

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlspecialchars_basic.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/htmlspecialchars_basic.phpt
+++ php-src/ext/standard/tests/strings/htmlspecialchars_basic.phpt
--TEST--
Test htmlspecialchars() function : basic functionality 
--FILE--
?php
/* Prototype  : string htmlspecialchars  ( string $string  [, int $quote_style  
[, string $charset  [, bool $double_encode  ]]] )
 * Description: Convert special characters to HTML entities
 * Source code: ext/standard/string.c
*/

echo *** Testing htmlspecialchars() : basic functionality ***\n;

$s1 = abc\\n;
$s2 = abc\\n;
$s3 = a,\bc\\n;
$s4 = a\'\'bc\\n;
$s5 = amp;lt;\n;
echo Basic tests\n;
echo Test 1:  . htmlspecialchars ($s1);
echo Test 2:  . htmlspecialchars ($s2);
echo Test 3:  . htmlspecialchars ($s3);
echo Test 4:  . htmlspecialchars ($s4);
echo Test 5:  . htmlspecialchars ($s5);
echo Test 6:  . htmlspecialchars ($s1,ENT_NOQUOTES);
echo Test 7:  . htmlspecialchars

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings htmlentities09.phpt htmlentities16.phpt htmlspecialchars_basic.phpt htmlspecialchars_decode_variation1.phpt htmlspecialchars_decode_variatio

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 22:45:33 2009 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings htmlspecialchars_basic.phpt 

  Modified files:  
/php-src/ext/standard/tests/strings 
htmlspecialchars_decode_variation6.phpt 
htmlspecialchars_decode_variation1.phpt 
htmlentities16.phpt 
htmlentities09.phpt 
  Log:
  New and fixed html tests. Tested in Windows, Linux and Linux 64.
  http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation6.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt
diff -u 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.1.2.1
 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.1.2.2
--- 
php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt:1.1.2.1
  Sat Sep 29 09:00:48 2007
+++ php-src/ext/standard/tests/strings/htmlspecialchars_decode_variation1.phpt  
Tue Jun 23 22:45:33 2009
@@ -31,51 +31,51 @@
 //array of values to iterate over
 $values = array(
 
-  // int data
-  0,
-  1,
-  12345,
-  -2345,
-
-  // float data
-  10.5,
-  -10.5,
-  10.5e10,
-  10.6E-10,
-  .5,
-
-  // array data
-  array(),
-  array(0),
-  array(1),
-  array(1, 2),
-  array('color' = 'red', 'item' = 'pen'),
-
-  // null data
-  NULL,
-  null,
-
-  // boolean data
-  true,
-  false,
-  TRUE,
-  FALSE,
-
-  // empty data
-  ,
-  '',
-
-  // object data
-  new classA(),
-
-  // undefined data
-  @$undefined_var,
-
-  // unset data
-  @$unset_var,
-
-  //resource
-  $file_handle
+ // int data
+/*1*/0,
+ 1,
+ 12345,
+ -2345,
+   
+ // float data
+/*5*/10.5,
+ -10.5,
+ 10.1234567e10,
+ 10.7654321E-10,
+ .5,
+   
+ // array data
+/*10*/   array(),
+ array(0),
+ array(1),
+ array(1, 2),
+ array('color' = 'red', 'item' = 'pen'),
+   
+ // null data
+/*15*/   NULL,
+ null,
+   
+ // boolean data
+/*17*/   true,
+ false,
+ TRUE,
+ FALSE,
+   
+ // empty data
+/*21*/   ,
+ '',
+   
+ // object data
+/*23*/   new classA(),
+   
+ // undefined data
+/*24*/   @$undefined_var,
+   
+ // unset data
+/*25*/   @$unset_var,
+   
+ //resource
+/*26*/   $file_handle
 );
 
 // loop through each element of the array for string
@@ -89,8 +89,8 @@
 // close the file resource used
 fclose($file_handle);
 
-echo Done;
 ?
+===DONE===
 --EXPECTF--
 *** Testing htmlspecialchars_decode() : usage variations ***
 -- Iterator 1 --
@@ -106,9 +106,9 @@
 -- Iterator 6 --
 string(5) -10.5
 -- Iterator 7 --
-string(12) 1050
+string(12) 101234567000
 -- Iterator 8 --
-string(7) 1.06E-9
+string(13) 1.07654321E-9
 -- Iterator 9 --
 string(3) 0.5
 -- Iterator 10 --
@@ -157,4 +157,4 @@
 
 Warning: htmlspecialchars_decode() expects parameter 1 to be string, resource 
given in %s on line %d
 NULL
-Done
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/htmlentities16.phpt?r1=1.5r2=1.5.6.1diff_format=u
Index: php-src/ext/standard/tests/strings/htmlentities16.phpt
diff -u php-src/ext/standard/tests/strings/htmlentities16.phpt:1.5 
php-src/ext/standard/tests/strings/htmlentities16.phpt:1.5.6.1
--- php-src/ext/standard/tests/strings/htmlentities16.phpt:1.5  Wed Apr 30 
16:30:44 2003
+++ php-src/ext/standard/tests/strings/htmlentities16.phpt  Tue Jun 23 
22:45:33 2009
@@ -14,8 +14,10 @@
 ?php
 mb_internal_encoding('cp1251');
 $str = \x88\xa9\xf0\xee\xf1\xea\xee\xf8\xed\xfb\xe9;
-var_dump($str, htmlentities($str, ENT_QUOTES, ''));
+var_dump(bin2hex($str), htmlentities($str, ENT_QUOTES, ''));
 ?
+===DONE===
 --EXPECT--
-string(11) ˆ©ðîñêîøíûé
+string(22) 88a9f0eef1eaeef8edfbe9
 string(75) 
euro;copy;#1088;#1086;#1089;#1082;#1086;#1096;#1085;#1099;#1081;
+===DONE===

[PHP-CVS] cvs: php-src /ext/pcre/tests preg_match_all_error3.phpt

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 23:00:54 2009 UTC

  Modified files:  
/php-src/ext/pcre/tests preg_match_all_error3.phpt 
  Log:
  Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error3.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/pcre/tests/preg_match_all_error3.phpt
diff -u php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.2 
php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.3
--- php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.2   Wed Nov 21 
18:23:02 2007
+++ php-src/ext/pcre/tests/preg_match_all_error3.phpt   Tue Jun 23 23:00:54 2009
@@ -12,7 +12,7 @@
 echo *** Testing preg_match_all() : error conditions ***\n;
 $regex = '/[a-z]/';
 $subject = 'string';
-var_dump(preg_match_all($regex, $subject, test));
+var_dump(preg_match_all($regex, $subject, 'test'));
 echo Done;
 ?
 --EXPECTF--



-- 
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/pcre/tests preg_match_all_error3.phpt

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 23:00:55 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/pcre/tests preg_match_all_error3.phpt 
  Log:
  Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error3.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/pcre/tests/preg_match_all_error3.phpt
diff -u php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.1.4.2 
php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.1.4.3
--- php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.1.4.2   Wed Nov 21 
18:22:01 2007
+++ php-src/ext/pcre/tests/preg_match_all_error3.phpt   Tue Jun 23 23:00:55 2009
@@ -12,7 +12,7 @@
 echo *** Testing preg_match_all() : error conditions ***\n;
 $regex = '/[a-z]/';
 $subject = 'string';
-var_dump(preg_match_all($regex, $subject, test));
+var_dump(preg_match_all($regex, $subject, 'test'));
 echo Done;
 ?
 --EXPECTF--



-- 
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/pcre/tests preg_match_all_error3.phpt

2009-06-23 Thread andy wharmby 
wharmby Tue Jun 23 23:00:57 2009 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/pcre/tests preg_match_all_error3.phpt 
  Log:
  Fix test
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error3.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/pcre/tests/preg_match_all_error3.phpt
diff -u php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.1.2.1 
php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.1.2.2
--- php-src/ext/pcre/tests/preg_match_all_error3.phpt:1.1.2.1   Wed Nov 21 
18:21:18 2007
+++ php-src/ext/pcre/tests/preg_match_all_error3.phpt   Tue Jun 23 23:00:57 2009
@@ -12,7 +12,7 @@
 echo *** Testing preg_match_all() : error conditions ***\n;
 $regex = '/[a-z]/';
 $subject = 'string';
-var_dump(preg_match_all($regex, $subject, test));
+var_dump(preg_match_all($regex, $subject, 'test'));
 echo Done;
 ?
 --EXPECTF--



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