[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Apr 28 01:32:56 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3386r2=1.3387diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3386 php-src/ChangeLog:1.3387 --- php-src/ChangeLog:1.3386Mon Apr 27 01:32:44 2009 +++ php-src/ChangeLog Tue Apr 28 01:32:54 2009 @@ -1,3 +1,132 @@ +2009-04-27 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_3) + ext/intl/msgformat/msgformat_attr.c: + + Removed unused variable + +2009-04-27 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + NEWS: + - BFN + +* (PHP_5_2) + ZendEngine2/FlexLexer.h + ZendEngine2/flex.skl + ext/reflection/php_reflection.c + ext/reflection/php_reflection.c + ext/reflection/tests/002.phpt + ext/reflection/tests/002.phpt + ext/reflection/tests/ReflectionClass_getMethod_001.phpt + ext/reflection/tests/ReflectionClass_getMethod_001.phpt + ext/reflection/tests/ReflectionClass_getMethods_001.phpt + ext/reflection/tests/ReflectionClass_getMethods_001.phpt + ext/reflection/tests/ReflectionClass_getProperties_001.phpt + ext/reflection/tests/ReflectionClass_getProperties_001.phpt + ext/reflection/tests/ReflectionClass_getProperty_001.phpt + ext/reflection/tests/ReflectionClass_getProperty_001.phpt + ext/reflection/tests/ReflectionClass_getProperty_003.phpt + ext/reflection/tests/ReflectionClass_getProperty_003.phpt + ext/reflection/tests/ReflectionClass_getProperty_004.phpt + ext/reflection/tests/ReflectionClass_getProperty_004.phpt + ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt + ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt: + - MFH: Fixed bug #47254 (Wrong Reflection for extends class) + +* ext/reflection/php_reflection.c + ext/reflection/tests/002.phpt + ext/reflection/tests/008.phpt + ext/reflection/tests/ReflectionClass_getMethod_001.phpt + ext/reflection/tests/ReflectionClass_getMethods_001.phpt + ext/reflection/tests/ReflectionClass_getProperties_001.phpt + ext/reflection/tests/ReflectionClass_getProperty_001.phpt + ext/reflection/tests/ReflectionClass_getProperty_003.phpt + ext/reflection/tests/ReflectionClass_getProperty_004.phpt + ext/reflection/tests/ReflectionMethod_getModifiers_basic.phpt: + - Fixed bug #47254 (Wrong Reflection for extends class) + +2009-04-27 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_3) + NEWS: + update + +2009-04-27 Scott MacVicar sc...@macvicar.net + +* (PHP_5_2) + NEWS + ext/xmlrpc/config.m4 + ext/xmlrpc/config.m4: + MFH Fix bug #47695 - xmlrpc --with-iconv-dir mangles --with-iconv if they + use different iconv versions. Could also just add a dependency on iconv to + fix this. + +* (PHP_5_3) + NEWS: + BFN + +2009-04-27 Kirti Velankar kir...@yahoo-inc.com + +* (PHP_5_3) + ext/intl/grapheme/grapheme_string.c + ext/intl/tests/grapheme.phpt: + Fix in grapheme_extract + +2009-04-27 Scott MacVicar sc...@macvicar.net + +* (PHP_5_3) + ext/sqlite3/php_sqlite3_structs.h + ext/sqlite3/sqlite3.c: + MFH Add the ability to enable exceptions rather than warnings for sqlite3, + needed for pyrus. + +* ext/sqlite3/php_sqlite3_structs.h + ext/sqlite3/sqlite3.c: + Add the ability to enable exceptions rather than warnings for sqlite3, + needed for pyrus. + +* ext/xmlrpc/config.m4: + Fix bug #47695 - xmlrpc --with-iconv-dir mangles --with-iconv if they use + different iconv versions. Could also just add a dependency on iconv to fix + this. + +2009-04-27 Kalle Sommer Nielsen kalle@gmail.com + +* (PHP_5_3) + ext/date/php_date.c: + MFH: Fixed bug #48088 (Wrong ARG_INFO for OO-API of DateTime) + +* ext/date/php_date.c: + Fixed bug #48088 (Wrong ARG_INFO for OO-API of DateTime) + +2009-04-27 Felipe Pena felipe...@gmail.com + +* (PHP_5_3) + NEWS + ext/standard/basic_functions.c: + - MFH: Fixed bug #48087 (call_user_method() invalid free of arguments) + +* ext/standard/basic_functions.c: + - Fixed bug #48087 (call_user_method() invalid free of arguments) + +2009-04-27 Pierre-Alain Joye pierre@gmail.com + +* (PHP_5_2) + ext/imap/config.w32: + - utf8_mime2text is present in 5.2's cclient + +2009-04-27 Sebastian Schürmann sschuermann...@yahoo.de + +* ext/spl/tests/spl_classes.phpt: + - fixing spl_classes test here as well + +2009-04-27 Pierre-Alain Joye pierre@gmail.com + +* (PHP_5_3) + ext/imap/php_imap.c: + - remove duplicate definition + 2009-04-26 Sebastian Schürmann sschuermann...@yahoo.de * (PHP_5_3) @@ -37553,7 +37682,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - -
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Apr 28 01:33:00 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1474r2=1.1475diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1474 ZendEngine2/ChangeLog:1.1475 --- ZendEngine2/ChangeLog:1.1474Sat Apr 25 01:32:46 2009 +++ ZendEngine2/ChangeLog Tue Apr 28 01:33:00 2009 @@ -1,3 +1,10 @@ +2009-04-27 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + FlexLexer.h + flex.skl: + - MFH: Fixed bug #47254 (Wrong Reflection for extends class) + 2009-04-24 Arnaud Le Blanc arnaud...@gmail.com * tests/unicode_001.phpt: @@ -28497,7 +28504,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1474 2009/04/25 01:32:46 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1475 2009/04/28 01:33:00 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -30221,7 +30228,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1474 2009/04/25 01:32:46 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1475 2009/04/28 01:33:00 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/imap config.w32
pajoye Mon Apr 27 08:23:29 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/imap config.w32
Log:
- utf8_mime2text is present in 5.2's cclient
http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.w32?r1=1.4.4.2r2=1.4.4.3diff_format=u
Index: php-src/ext/imap/config.w32
diff -u php-src/ext/imap/config.w32:1.4.4.2 php-src/ext/imap/config.w32:1.4.4.3
--- php-src/ext/imap/config.w32:1.4.4.2 Mon Dec 1 00:03:03 2008
+++ php-src/ext/imap/config.w32 Mon Apr 27 08:23:29 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.4.2 2008/12/01 00:03:03 pajoye Exp $
+// $Id: config.w32,v 1.4.4.3 2009/04/27 08:23:29 pajoye Exp $
// vim:ft=javascript
ARG_WITH(imap, IMAP Support, no);
@@ -16,6 +16,8 @@
ADD_FLAG(CFLAGS_IMAP, /D HAVE_IMAP2000=1 /D HAVE_IMAP2004=1
/D HAVE_IMAP_SSL=1);
AC_DEFINE('HAVE_IMAP', 1, 'Have IMAP support', true);
AC_DEFINE('HAVE_RFC822_OUTPUT_ADDRESS_LIST', 1, 'Have
rfc822_output_address_list', true);
+ AC_DEFINE('HAVE_NEW_MIME2TEXT', 1, 'Have utf8_mime2text', true);
+ HAVE_NEW_MIME2TEXT
} else {
WARNING(imap not enabled; libraries and headers not found);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c
felipe Mon Apr 27 12:50:00 2009 UTC
Modified files:
/php-src/ext/standard basic_functions.c
Log:
- Fixed bug #48087 (call_user_method() invalid free of arguments)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.953r2=1.954diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.953
php-src/ext/standard/basic_functions.c:1.954
--- php-src/ext/standard/basic_functions.c:1.953Sat Apr 25 21:06:01 2009
+++ php-src/ext/standard/basic_functions.c Mon Apr 27 12:50:00 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.953 2009/04/25 21:06:01 lbarnaud Exp $ */
+/* $Id: basic_functions.c,v 1.954 2009/04/27 12:50:00 felipe Exp $ */
#include php.h
#include php_streams.h
@@ -4777,7 +4777,9 @@
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to call
%R(), Z_TYPE_P(callback), Z_UNIVAL_P(callback));
}
- efree(params);
+ if (n_params) {
+ efree(params);
+ }
}
/* }}} */
--
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 basic_functions.c
felipe Mon Apr 27 12:52:32 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c
/php-srcNEWS
Log:
- MFH: Fixed bug #48087 (call_user_method() invalid free of arguments)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.87r2=1.725.2.31.2.64.2.88diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.87
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.88
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.87 Fri Mar 27
02:32:56 2009
+++ php-src/ext/standard/basic_functions.c Mon Apr 27 12:52:31 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.87 2009/03/27 02:32:56 lbarnaud
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.88 2009/04/27 12:52:31 felipe
Exp $ */
#include php.h
#include php_streams.h
@@ -4780,7 +4780,9 @@
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to call
%s(), Z_STRVAL_P(callback));
}
- efree(params);
+ if (n_params) {
+ efree(params);
+ }
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.567r2=1.2027.2.547.2.965.2.568diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.567
php-src/NEWS:1.2027.2.547.2.965.2.568
--- php-src/NEWS:1.2027.2.547.2.965.2.567 Thu Apr 23 13:26:09 2009
+++ php-src/NEWSMon Apr 27 12:52:31 2009
@@ -12,6 +12,7 @@
disable this behaviour using http=array(auto_decode=0) in stream
context. (Dmitry)
+- Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe)
- Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo)
- Fixed bug #48023 (spl_autoload_register didn't store closures). (Etienne)
- Fixed bug #48004 (Error handler prevents creation of default object).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
kalle Mon Apr 27 14:21:57 2009 UTC Modified files: /php-src/ext/date php_date.c Log: Fixed bug #48088 (Wrong ARG_INFO for OO-API of DateTime) http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.223r2=1.224diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.223 php-src/ext/date/php_date.c:1.224 --- php-src/ext/date/php_date.c:1.223 Tue Apr 7 20:03:00 2009 +++ php-src/ext/date/php_date.c Mon Apr 27 14:21:57 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.223 2009/04/07 20:03:00 felipe Exp $ */ +/* $Id: php_date.c,v 1.224 2009/04/27 14:21:57 kalle Exp $ */ #include php.h #include php_streams.h @@ -435,7 +435,7 @@ PHP_ME_MAPPING(getOffset, date_offset_get, arginfo_date_method_offset_get, 0) PHP_ME_MAPPING(setTime, date_time_set, arginfo_date_method_time_set, 0) PHP_ME_MAPPING(setDate, date_date_set, arginfo_date_method_date_set, 0) - PHP_ME_MAPPING(setISODate, date_isodate_set, arginfo_date_isodate_set, 0) + PHP_ME_MAPPING(setISODate, date_isodate_set, arginfo_date_method_isodate_set, 0) PHP_ME_MAPPING(setTimestamp,date_timestamp_set, arginfo_date_method_timestamp_set, 0) PHP_ME_MAPPING(getTimestamp,date_timestamp_get, arginfo_date_method_timestamp_get, 0) PHP_ME_MAPPING(diff,date_diff, arginfo_date_method_diff, 0) -- 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/date php_date.c
kalle Mon Apr 27 14:22:15 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/date php_date.c Log: MFH: Fixed bug #48088 (Wrong ARG_INFO for OO-API of DateTime) http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.67r2=1.43.2.45.2.51.2.68diff_format=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.67 php-src/ext/date/php_date.c:1.43.2.45.2.51.2.68 --- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.67 Tue Apr 7 20:05:50 2009 +++ php-src/ext/date/php_date.c Mon Apr 27 14:22:15 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.45.2.51.2.67 2009/04/07 20:05:50 felipe Exp $ */ +/* $Id: php_date.c,v 1.43.2.45.2.51.2.68 2009/04/27 14:22:15 kalle Exp $ */ #include php.h #include php_streams.h @@ -428,7 +428,7 @@ PHP_ME_MAPPING(getOffset, date_offset_get, arginfo_date_method_offset_get, 0) PHP_ME_MAPPING(setTime, date_time_set, arginfo_date_method_time_set, 0) PHP_ME_MAPPING(setDate, date_date_set, arginfo_date_method_date_set, 0) - PHP_ME_MAPPING(setISODate, date_isodate_set, arginfo_date_isodate_set, 0) + PHP_ME_MAPPING(setISODate, date_isodate_set, arginfo_date_method_isodate_set, 0) PHP_ME_MAPPING(setTimestamp,date_timestamp_set, arginfo_date_method_timestamp_set, 0) PHP_ME_MAPPING(getTimestamp,date_timestamp_get, arginfo_date_method_timestamp_get, 0) PHP_ME_MAPPING(diff,date_diff, arginfo_date_method_diff, 0) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlrpc config.m4
scottmacMon Apr 27 17:49:18 2009 UTC Modified files: /php-src/ext/xmlrpc config.m4 Log: Fix bug #47695 - xmlrpc --with-iconv-dir mangles --with-iconv if they use different iconv versions. Could also just add a dependency on iconv to fix this. http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.m4?r1=1.28r2=1.29diff_format=u Index: php-src/ext/xmlrpc/config.m4 diff -u php-src/ext/xmlrpc/config.m4:1.28 php-src/ext/xmlrpc/config.m4:1.29 --- php-src/ext/xmlrpc/config.m4:1.28 Thu Dec 22 11:02:51 2005 +++ php-src/ext/xmlrpc/config.m4Mon Apr 27 17:49:18 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28 2005/12/22 11:02:51 tony2001 Exp $ +dnl $Id: config.m4,v 1.29 2009/04/27 17:49:18 scottmac Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -61,17 +61,21 @@ fi fi - if test $PHP_ICONV_DIR != no; then -PHP_ICONV=$PHP_ICONV_DIR - fi + dnl if iconv is shared or missing then we should build iconv ourselves + if test $PHP_ICONV_SHARED = yes || test $PHP_ICONV = no; then + +if test $PHP_ICONV_DIR != no; then + PHP_ICONV=$PHP_ICONV_DIR +fi - if test -z $PHP_ICONV || test $PHP_ICONV = no; then -PHP_ICONV=yes - fi +if test -z $PHP_ICONV || test $PHP_ICONV = no; then + PHP_ICONV=yes +fi - PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ -AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - ]) +PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) +]) + fi fi if test $PHP_XMLRPC = yes; then -- 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/xmlrpc config.m4
scottmacMon Apr 27 17:49:32 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/xmlrpc config.m4 Log: MFH Fix bug #47695 - xmlrpc --with-iconv-dir mangles --with-iconv if they use different iconv versions. Could also just add a dependency on iconv to fix this. http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.m4?r1=1.25.2.3r2=1.25.2.3.4.1diff_format=u Index: php-src/ext/xmlrpc/config.m4 diff -u php-src/ext/xmlrpc/config.m4:1.25.2.3 php-src/ext/xmlrpc/config.m4:1.25.2.3.4.1 --- php-src/ext/xmlrpc/config.m4:1.25.2.3 Tue Nov 29 18:26:02 2005 +++ php-src/ext/xmlrpc/config.m4Mon Apr 27 17:49:32 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.3 2005/11/29 18:26:02 tony2001 Exp $ +dnl $Id: config.m4,v 1.25.2.3.4.1 2009/04/27 17:49:32 scottmac Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -61,17 +61,21 @@ fi fi - if test $PHP_ICONV_DIR != no; then -PHP_ICONV=$PHP_ICONV_DIR - fi + dnl if iconv is shared or missing then we should build iconv ourselves + if test $PHP_ICONV_SHARED = yes || test $PHP_ICONV = no; then + +if test $PHP_ICONV_DIR != no; then + PHP_ICONV=$PHP_ICONV_DIR +fi - if test -z $PHP_ICONV || test $PHP_ICONV = no; then -PHP_ICONV=yes - fi +if test -z $PHP_ICONV || test $PHP_ICONV = no; then + PHP_ICONV=yes +fi - PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ -AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - ]) +PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) +]) + fi fi if test $PHP_XMLRPC = yes; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 php_sqlite3_structs.h sqlite3.c
scottmacMon Apr 27 18:15:54 2009 UTC
Modified files:
/php-src/ext/sqlite3sqlite3.c php_sqlite3_structs.h
Log:
Add the ability to enable exceptions rather than warnings for sqlite3, needed
for pyrus.
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.37r2=1.38diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.37 php-src/ext/sqlite3/sqlite3.c:1.38
--- php-src/ext/sqlite3/sqlite3.c:1.37 Tue Mar 17 02:42:41 2009
+++ php-src/ext/sqlite3/sqlite3.c Mon Apr 27 18:15:54 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.37 2009/03/17 02:42:41 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.38 2009/04/27 18:15:54 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -41,9 +41,33 @@
static void sqlite3_param_dtor(void *data);
static int php_sqlite3_compare_stmt_zval_free( php_sqlite3_free_list
**free_list, zval *statement );
-#define SQLITE3_CHECK_INITIALIZED(member, class_name) \
+/* {{{ Error Handler
+*/
+static void php_sqlite3_error(php_sqlite3_db_object *db_obj, char *format, ...)
+{
+ va_list arg;
+ char*message;
+ TSRMLS_FETCH();
+
+ va_start(arg, format);
+ vspprintf(message, 0, format, arg);
+ va_end(arg);
+
+ if (db_obj-exception) {
+ zend_throw_exception(zend_exception_get_default(TSRMLS_C),
message, 0 TSRMLS_CC);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, message);
+ }
+
+ if (message) {
+ efree(message);
+ }
+}
+/* }}} */
+
+#define SQLITE3_CHECK_INITIALIZED(db_obj, member, class_name) \
if (!(member)) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, The #class_name
object has not been correctly initialised); \
+ php_sqlite3_error(db_obj, The #class_name object has not
been correctly initialised); \
RETURN_FALSE; \
}
@@ -174,7 +198,7 @@
zend_llist_clean((db_obj-free_list));
errcode = sqlite3_close(db_obj-db);
if (errcode != SQLITE_OK) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
close database: %d, %s, errcode, sqlite3_errmsg(db_obj-db));
+ php_sqlite3_error(db_obj, Unable to close database:
%d, %s, errcode, sqlite3_errmsg(db_obj-db));
RETURN_FALSE;
}
db_obj-initialised = 0;
@@ -194,14 +218,14 @@
int sql_len;
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj-initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj-initialised, SQLite3)
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
sql, sql_len, UG(utf8_conv))) {
return;
}
if (sqlite3_exec(db_obj-db, sql, NULL, NULL, errtext) != SQLITE_OK) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, errtext);
+ php_sqlite3_error(db_obj, %s, errtext);
sqlite3_free(errtext);
RETURN_FALSE;
}
@@ -235,7 +259,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj-initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj-initialised, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -253,7 +277,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj-db, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj-db, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -271,7 +295,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj-db, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj-db, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -293,19 +317,19 @@
int extension_len, extension_dir_len;
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj-initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj-initialised, SQLite3)
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
extension, extension_len)) {
return;
}
if (!SQLITE3G(extension_dir)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, SQLite Extension
are disabled);
+ php_sqlite3_error(db_obj, SQLite Extension are disabled);
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 php_sqlite3_structs.h sqlite3.c
scottmacMon Apr 27 18:16:46 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3php_sqlite3_structs.h sqlite3.c
Log:
MFH Add the ability to enable exceptions rather than warnings for sqlite3,
needed for pyrus.
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/php_sqlite3_structs.h?r1=1.1.2.7r2=1.1.2.8diff_format=u
Index: php-src/ext/sqlite3/php_sqlite3_structs.h
diff -u php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.7
php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.8
--- php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.7 Wed Dec 31 11:15:44 2008
+++ php-src/ext/sqlite3/php_sqlite3_structs.h Mon Apr 27 18:16:46 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_sqlite3_structs.h,v 1.1.2.7 2008/12/31 11:15:44 sebastian Exp $ */
+/* $Id: php_sqlite3_structs.h,v 1.1.2.8 2009/04/27 18:16:46 scottmac Exp $ */
#ifndef PHP_SQLITE_STRUCTS_H
#define PHP_SQLITE_STRUCTS_H
@@ -68,6 +68,7 @@
int initialised;
sqlite3 *db;
php_sqlite3_func *funcs;
+ zend_bool exception;
zend_llist free_list;
} php_sqlite3_db_object;
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.34r2=1.1.2.35diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.34
php-src/ext/sqlite3/sqlite3.c:1.1.2.35
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.34 Tue Mar 17 02:45:12 2009
+++ php-src/ext/sqlite3/sqlite3.c Mon Apr 27 18:16:46 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.34 2009/03/17 02:45:12 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.35 2009/04/27 18:16:46 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -40,9 +40,33 @@
static void sqlite3_param_dtor(void *data);
static int php_sqlite3_compare_stmt_zval_free( php_sqlite3_free_list
**free_list, zval *statement );
-#define SQLITE3_CHECK_INITIALIZED(member, class_name) \
+/* {{{ Error Handler
+*/
+static void php_sqlite3_error(php_sqlite3_db_object *db_obj, char *format, ...)
+{
+ va_list arg;
+ char*message;
+ TSRMLS_FETCH();
+
+ va_start(arg, format);
+ vspprintf(message, 0, format, arg);
+ va_end(arg);
+
+ if (db_obj-exception) {
+ zend_throw_exception(zend_exception_get_default(TSRMLS_C),
message, 0 TSRMLS_CC);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, message);
+ }
+
+ if (message) {
+ efree(message);
+ }
+}
+/* }}} */
+
+#define SQLITE3_CHECK_INITIALIZED(db_obj, member, class_name) \
if (!(member)) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, The #class_name
object has not been correctly initialised); \
+ php_sqlite3_error(db_obj, The #class_name object has not
been correctly initialised); \
RETURN_FALSE; \
}
@@ -159,7 +183,7 @@
zend_llist_clean((db_obj-free_list));
errcode = sqlite3_close(db_obj-db);
if (errcode != SQLITE_OK) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
close database: %d, %s, errcode, sqlite3_errmsg(db_obj-db));
+ php_sqlite3_error(db_obj, Unable to close database:
%d, %s, errcode, sqlite3_errmsg(db_obj-db));
RETURN_FALSE;
}
db_obj-initialised = 0;
@@ -179,14 +203,14 @@
int sql_len;
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj-initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj-initialised, SQLite3)
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s,
sql, sql_len)) {
return;
}
if (sqlite3_exec(db_obj-db, sql, NULL, NULL, errtext) != SQLITE_OK) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %s, errtext);
+ php_sqlite3_error(db_obj, %s, errtext);
sqlite3_free(errtext);
RETURN_FALSE;
}
@@ -220,7 +244,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj-initialised, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj-initialised, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -238,7 +262,7 @@
zval *object = getThis();
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
- SQLITE3_CHECK_INITIALIZED(db_obj-db, SQLite3)
+ SQLITE3_CHECK_INITIALIZED(db_obj, db_obj-db, SQLite3)
if (zend_parse_parameters_none() == FAILURE) {
return;
@@ -256,7 +280,7 @@
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/tests grapheme.phpt
kirtig Mon Apr 27 18:17:39 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/intl/tests grapheme.phpt Log: Fix in grapheme_extract http://cvs.php.net/viewvc.cgi/php-src/ext/intl/tests/grapheme.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/intl/tests/grapheme.phpt diff -u php-src/ext/intl/tests/grapheme.phpt:1.1.2.2 php-src/ext/intl/tests/grapheme.phpt:1.1.2.3 --- php-src/ext/intl/tests/grapheme.phpt:1.1.2.2Fri Apr 10 16:53:35 2009 +++ php-src/ext/intl/tests/grapheme.phptMon Apr 27 18:17:39 2009 @@ -560,7 +560,7 @@ array( abc, 1, 1, 2, b ), array( abc, 1, 2, 3, c ), array( abc, 0, 2, 2, ), - +array( http://news.bbc.co.uk/2/hi/middle_east/7831588.stm;, 48, 48 , 50 , tm ), array( $char_a_ring_nfd . bc, 3, $char_a_ring_nfd . bc ), array( $char_a_ring_nfd . bc, 2, $char_a_ring_nfd . b ), @@ -1095,6 +1095,7 @@ extract from abc 1 graphemes - grapheme_extract starting at byte position 1 with $next = b == b $next=2 == 2 extract from abc 1 graphemes - grapheme_extract starting at byte position 2 with $next = c == c $next=3 == 3 extract from abc 0 graphemes - grapheme_extract starting at byte position 2 with $next = == $next=2 == 2 +extract from http%3A%2F%2Fnews.bbc.co.uk%2F2%2Fhi%2Fmiddle_east%2F7831588.stm 48 graphemes - grapheme_extract starting at byte position 48 with $next = tm == tm $next=50 == 50 extract from a%CC%8Abc 3 graphemes - grapheme_extract = a%CC%8Abc == a%CC%8Abc extract from a%CC%8Abc 2 graphemes - grapheme_extract = a%CC%8Ab == a%CC%8Ab extract from a%CC%8Abc 1 graphemes - grapheme_extract = a%CC%8A == a%CC%8A -- 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/intl/grapheme grapheme_string.c
kirtig Mon Apr 27 18:18:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/grapheme grapheme_string.c
Log:
Fix in grapheme_extract
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/grapheme/grapheme_string.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/intl/grapheme/grapheme_string.c
diff -u php-src/ext/intl/grapheme/grapheme_string.c:1.1.2.3
php-src/ext/intl/grapheme/grapheme_string.c:1.1.2.4
--- php-src/ext/intl/grapheme/grapheme_string.c:1.1.2.3 Fri Apr 10 16:53:35 2009
+++ php-src/ext/intl/grapheme/grapheme_string.c Mon Apr 27 18:18:04 2009
@@ -852,10 +852,11 @@
*/
if ( -1 != grapheme_ascii_check(pstr, size + 1 str_len ? size + 1 :
str_len ) ) {
+long nsize = ( size str_len ? size : str_len );
if ( NULL != next ) {
- ZVAL_LONG(next, start+size);
+ ZVAL_LONG(next, start+nsize);
}
- RETURN_STRINGL(((char *)pstr), size, 1);
+ RETURN_STRINGL(((char *)pstr), nsize, 1);
}
/* convert the strings to UTF-16. */
--
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
scottmacMon Apr 27 18:20:19 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.568r2=1.2027.2.547.2.965.2.569diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.568 php-src/NEWS:1.2027.2.547.2.965.2.569 --- php-src/NEWS:1.2027.2.547.2.965.2.568 Mon Apr 27 12:52:31 2009 +++ php-src/NEWSMon Apr 27 18:20:19 2009 @@ -11,6 +11,7 @@ Transfer-Encoding: chunked header presents in response. It's possible to disable this behaviour using http=array(auto_decode=0) in stream context. (Dmitry) +- Added ability to throw exceptions from SQLite3 instead of warnings. (Scott) - Fixed bug #48087 (call_user_method() invalid free of arguments). (Felipe) - Fixed bug #48060 (pdo_pgsql - large objects are returned as empty). (Matteo) @@ -32,6 +33,8 @@ - Fixed bug #47714 (autoloading classes inside exception_handler leads to crashes). (Dmitry) - Fixed bug #47699 (autoload and late static binding). (Dmitry) +- Fixed bug #47695 (build error when xmlrpc and iconv are compiled + against different iconv versions). (Scott) - Fixed bug #47662 (Support more than 127 subpatterns in preg_match). (Nuno) - Fixed bug #47596 (Bus error on parsing file). (Dmitry) - Fixed bug #47560 (explode()'s limit parameter odd behaviour). (Matt) -- 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) / NEWS
Scott MacVicar kirjoitti: scottmacMon Apr 27 18:20:19 2009 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS Log: BFN [snip] crashes). (Dmitry) - Fixed bug #47699 (autoload and late static binding). (Dmitry) +- Fixed bug #47695 (build error when xmlrpc and iconv are compiled + against different iconv versions). (Scott) Why aren't you fixing this in the bugfix branch? It's getting quite boring to ask this same question from EVERYONE all the fucking time. Did some somewhere say that the only active branch is PHP_5_3 suddenly?! --Jani -- 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) / NEWS /ext/xmlrpc config.m4
scottmacMon Apr 27 18:38:58 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/xmlrpc config.m4 Log: MFH Fix bug #47695 - xmlrpc --with-iconv-dir mangles --with-iconv if they use different iconv versions. Could also just add a dependency on iconv to fix this. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1475r2=1.2027.2.547.2.1476diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1475 php-src/NEWS:1.2027.2.547.2.1476 --- php-src/NEWS:1.2027.2.547.2.1475Thu Apr 23 22:34:47 2009 +++ php-src/NEWSMon Apr 27 18:38:57 2009 @@ -38,6 +38,8 @@ (crrodriguez at opensuse dot org, Ilia) - Fixed bug #47704 (PHP crashes on some bad operations with string offsets). (Dmitry) +- Fixed bug #47695 (build error when xmlrpc and iconv are compiled + against different iconv versions). (Scott) - Fixed bug #47667 (ZipArchive::OVERWRITE seems to have no effect). (Mikko, Pierre) - Fixed bug #47644 (Valid integers are truncated with json_decode()). (Scott) http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/config.m4?r1=1.25.2.3r2=1.25.2.3.2.1diff_format=u Index: php-src/ext/xmlrpc/config.m4 diff -u php-src/ext/xmlrpc/config.m4:1.25.2.3 php-src/ext/xmlrpc/config.m4:1.25.2.3.2.1 --- php-src/ext/xmlrpc/config.m4:1.25.2.3 Tue Nov 29 18:26:02 2005 +++ php-src/ext/xmlrpc/config.m4Mon Apr 27 18:38:58 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.25.2.3 2005/11/29 18:26:02 tony2001 Exp $ +dnl $Id: config.m4,v 1.25.2.3.2.1 2009/04/27 18:38:58 scottmac Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -61,17 +61,21 @@ fi fi - if test $PHP_ICONV_DIR != no; then -PHP_ICONV=$PHP_ICONV_DIR - fi + dnl if iconv is shared or missing then we should build iconv ourselves + if test $PHP_ICONV_SHARED = yes || test $PHP_ICONV = no; then + +if test $PHP_ICONV_DIR != no; then + PHP_ICONV=$PHP_ICONV_DIR +fi - if test -z $PHP_ICONV || test $PHP_ICONV = no; then -PHP_ICONV=yes - fi +if test -z $PHP_ICONV || test $PHP_ICONV = no; then + PHP_ICONV=yes +fi - PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ -AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) - ]) +PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) +]) + fi fi if test $PHP_XMLRPC = yes; then -- 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) / NEWS
On 27 Apr 2009, at 19:35, Jani Taskinen wrote: Scott MacVicar kirjoitti: scottmacMon Apr 27 18:20:19 2009 UTC Modified files: (Branch: PHP_5_3) /php-src NEWS Log: BFN [snip] crashes). (Dmitry) - Fixed bug #47699 (autoload and late static binding). (Dmitry) +- Fixed bug #47695 (build error when xmlrpc and iconv are compiled + against different iconv versions). (Scott) Why aren't you fixing this in the bugfix branch? It's getting quite boring to ask this same question from EVERYONE all the fucking time. Did some somewhere say that the only active branch is PHP_5_3 suddenly?! For me it was an accident, fixed in 5.2 now. Scott -- 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
janiMon Apr 27 18:45:12 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: update http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.569r2=1.2027.2.547.2.965.2.570diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.569 php-src/NEWS:1.2027.2.547.2.965.2.570 --- php-src/NEWS:1.2027.2.547.2.965.2.569 Mon Apr 27 18:20:19 2009 +++ php-src/NEWSMon Apr 27 18:45:12 2009 @@ -1,9 +1,11 @@ PHPNEWS ||| ?? ??? 200?, PHP 5.3.0 RC 2 -- Undeprecated ticks. (Arnaud) - Upgraded bundled sqlite to version 3.6.13. (Ilia) - Upgraded bundled PCRE to version 7.9. (Nuno) + +- Undeprecated ticks. (Arnaud) + - Added 'n' flag to fopen to allow passing O_NONBLOCK to the underlying open(2) system call. (Mikko) - Added dechunk filter which can decode HTTP responses with chunked @@ -33,8 +35,6 @@ - Fixed bug #47714 (autoloading classes inside exception_handler leads to crashes). (Dmitry) - Fixed bug #47699 (autoload and late static binding). (Dmitry) -- Fixed bug #47695 (build error when xmlrpc and iconv are compiled - against different iconv versions). (Scott) - Fixed bug #47662 (Support more than 127 subpatterns in preg_match). (Nuno) - Fixed bug #47596 (Bus error on parsing file). (Dmitry) - Fixed bug #47560 (explode()'s limit parameter odd behaviour). (Matt) -- 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/intl/grapheme grapheme_string.c
Hi
2009/4/27 Kirti Velankar kir...@php.net:
kirtig Mon Apr 27 18:18:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/grapheme grapheme_string.c
Log:
Fix in grapheme_extract
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/grapheme/grapheme_string.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/intl/grapheme/grapheme_string.c
diff -u php-src/ext/intl/grapheme/grapheme_string.c:1.1.2.3
php-src/ext/intl/grapheme/grapheme_string.c:1.1.2.4
--- php-src/ext/intl/grapheme/grapheme_string.c:1.1.2.3 Fri Apr 10 16:53:35
2009
+++ php-src/ext/intl/grapheme/grapheme_string.c Mon Apr 27 18:18:04 2009
@@ -852,10 +852,11 @@
*/
if ( -1 != grapheme_ascii_check(pstr, size + 1 str_len ? size + 1 :
str_len ) ) {
+ long nsize = ( size str_len ? size : str_len );
if ( NULL != next ) {
- ZVAL_LONG(next, start+size);
+ ZVAL_LONG(next, start+nsize);
}
- RETURN_STRINGL(((char *)pstr), size, 1);
+ RETURN_STRINGL(((char *)pstr), nsize, 1);
}
/* convert the strings to UTF-16. */
Shouldn't this be in HEAD aswell?
--
Kalle Sommer Nielsen
ka...@php.net
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests 002.phpt 008.phpt ReflectionClass_getMethod_001.phpt ReflectionClass_getMethods_001.phpt ReflectionClass_getProperties_00
felipe Mon Apr 27 19:46:03 2009 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
/php-src/ext/reflection/tests 002.phpt 008.phpt
ReflectionClass_getMethod_001.phpt
ReflectionClass_getMethods_001.phpt
ReflectionClass_getProperties_001.phpt
ReflectionClass_getProperty_001.phpt
ReflectionClass_getProperty_003.phpt
ReflectionClass_getProperty_004.phpt
ReflectionMethod_getModifiers_basic.phpt
Log:
- Fixed bug #47254 (Wrong Reflection for extends class)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.342r2=1.343diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.342
php-src/ext/reflection/php_reflection.c:1.343
--- php-src/ext/reflection/php_reflection.c:1.342 Sat Apr 4 14:35:28 2009
+++ php-src/ext/reflection/php_reflection.c Mon Apr 27 19:46:02 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.342 2009/04/04 14:35:28 sebastian Exp $ */
+/* $Id: php_reflection.c,v 1.343 2009/04/27 19:46:02 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1239,7 +1239,8 @@
MAKE_STD_ZVAL(name);
MAKE_STD_ZVAL(classname);
ZVAL_TEXT(name, method-common.function_name, 1);
- ZVAL_TEXTL(classname, ce-name, ce-name_length, 1);
+ ZVAL_UNICODEL(classname, method-common.scope-name.u,
method-common.scope-name_length, 1);
+
reflection_instantiate(reflection_method_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object
TSRMLS_CC);
intern-ptr = method;
@@ -1283,7 +1284,7 @@
MAKE_STD_ZVAL(name);
MAKE_STD_ZVAL(classname);
ZVAL_TEXT(name, prop_name, 1);
- ZVAL_TEXTL(classname, ce-name, ce-name_length, 1);
+ ZVAL_UNICODEL(classname, prop-ce-name.u, prop-ce-name_length, 1);
reflection_instantiate(reflection_property_ptr, object TSRMLS_CC);
intern = (reflection_object *) zend_object_store_get_object(object
TSRMLS_CC);
@@ -2542,11 +2543,6 @@
zval_dtor(ztmp);
}
- MAKE_STD_ZVAL(classname);
- ZVAL_TEXTL(classname, ce-name, ce-name_length, 1);
-
- zend_ascii_hash_update(Z_OBJPROP_P(object), class, sizeof(class),
(void **) classname, sizeof(zval *), NULL);
-
lcname = zend_u_str_case_fold(type, name_str, name_len, 1, lcname_len);
if (ce == zend_ce_closure orig_obj (lcname_len ==
sizeof(ZEND_INVOKE_FUNC_NAME)-1)
@@ -2589,18 +2585,25 @@
return;
}
}
-
+
+ MAKE_STD_ZVAL(classname);
MAKE_STD_ZVAL(name);
+
if (intern-obj) {
- ZVAL_ZSTRL(name, type, name_str, name_len, 1);
+ ZVAL_UNICODEL(classname, ce-name.u, ce-name_length, 1);
+ ZVAL_ZSTRL(name, type, name_str, name_len, 1);
} else {
+ ZVAL_UNICODEL(classname, mptr-common.scope-name.u,
mptr-common.scope-name_length, 1);
ZVAL_TEXT(name, mptr-common.function_name, 1);
}
efree(lcname.v);
if (free_name_str) {
efree(name_str.v);
}
+
+ zend_ascii_hash_update(Z_OBJPROP_P(object), class, sizeof(class),
(void **) classname, sizeof(zval *), NULL);
zend_ascii_hash_update(Z_OBJPROP_P(object), name, sizeof(name),
(void **) name, sizeof(zval *), NULL);
+
intern-ptr = mptr;
intern-ref_type = REF_TYPE_FUNCTION;
intern-ce = ce;
@@ -4525,17 +4528,17 @@
}
MAKE_STD_ZVAL(classname);
- ZVAL_TEXTL(classname, ce-name, ce-name_length, 1);
- zend_ascii_hash_update(Z_OBJPROP_P(object), class, sizeof(class),
(void **) classname, sizeof(zval *), NULL);
-
-
MAKE_STD_ZVAL(propname);
+
if (dynam_prop == 0) {
zend_u_unmangle_property_name(IS_UNICODE, property_info-name,
property_info-name_length, class_name, prop_name);
+ ZVAL_UNICODEL(classname, property_info-ce-name.u,
property_info-ce-name_length, 1);
ZVAL_TEXT(propname, prop_name, 1);
} else {
+ ZVAL_UNICODEL(classname, ce-name.u, ce-name_length, 1);
ZVAL_TEXTL(propname, name_str, name_len, 1);
}
+ zend_ascii_hash_update(Z_OBJPROP_P(object), class, sizeof(class),
(void **) classname, sizeof(zval *), NULL);
zend_ascii_hash_update(Z_OBJPROP_P(object), name, sizeof(name),
(void **) propname, sizeof(zval *), NULL);
reference = (property_reference*) emalloc(sizeof(property_reference));
@@
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/pdo_sqlite/sqlite/src keywordhash.h /ext/reflection php_reflection.c /ext/reflection/tests 002.phpt ReflectionClass_getMethod_001.phpt ReflectionClass_getMethods
felipe Mon Apr 27 19:54:35 2009 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2FlexLexer.h flex.skl /php-src/ext/pdo_sqlite/sqlite/src keywordhash.h /php-src/ext/reflection php_reflection.c /php-src/ext/reflection/tests 002.phpt ReflectionClass_getMethod_001.phpt ReflectionClass_getMethods_001.phpt ReflectionClass_getProperties_001.phpt ReflectionClass_getProperty_001.phpt ReflectionClass_getProperty_003.phpt ReflectionClass_getProperty_004.phpt ReflectionMethod_getModifiers_basic.phpt Log: - MFH: Fixed bug #47254 (Wrong Reflection for extends class) http://cvs.php.net/viewvc.cgi/ZendEngine2/FlexLexer.h?r1=1.4r2=1.4.18.1diff_format=u Index: ZendEngine2/FlexLexer.h diff -u ZendEngine2/FlexLexer.h:1.4 ZendEngine2/FlexLexer.h:1.4.18.1 --- ZendEngine2/FlexLexer.h:1.4 Mon Jul 3 00:55:36 2000 +++ ZendEngine2/FlexLexer.h Mon Apr 27 19:54:34 2009 @@ -1,4 +1,4 @@ -// $Header: /repository/ZendEngine2/Attic/FlexLexer.h,v 1.4 2000/07/03 00:55:36 sascha Exp $ +// $Header: /repository/ZendEngine2/Attic/FlexLexer.h,v 1.4.18.1 2009/04/27 19:54:34 felipe Exp $ // FlexLexer.h -- define interfaces for lexical analyzer classes generated // by flex http://cvs.php.net/viewvc.cgi/ZendEngine2/flex.skl?r1=1.31r2=1.31.6.1diff_format=u Index: ZendEngine2/flex.skl diff -u ZendEngine2/flex.skl:1.31 ZendEngine2/flex.skl:1.31.6.1 --- ZendEngine2/flex.skl:1.31 Mon Aug 11 05:24:41 2003 +++ ZendEngine2/flex.sklMon Apr 27 19:54:34 2009 @@ -1,7 +1,7 @@ /* A Lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /repository/ZendEngine2/Attic/flex.skl,v 1.31 2003/08/11 05:24:41 fujimoto Exp $ + * $Header: /repository/ZendEngine2/Attic/flex.skl,v 1.31.6.1 2009/04/27 19:54:34 felipe Exp $ * vim:ft=lex: */ http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h?r1=1.2.2.1.2.4r2=1.2.2.1.2.5diff_format=u Index: php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h diff -u php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h:1.2.2.1.2.4 php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h:1.2.2.1.2.5 --- php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h:1.2.2.1.2.4 Wed May 16 21:04:46 2007 +++ php-src/ext/pdo_sqlite/sqlite/src/keywordhash.h Mon Apr 27 19:54:34 2009 @@ -2,7 +2,7 @@ ** ** The code in this file has been automatically generated by ** -** $Header: /repository/php-src/ext/pdo_sqlite/sqlite/src/Attic/keywordhash.h,v 1.2.2.1.2.4 2007/05/16 21:04:46 iliaa Exp $ +** $Header: /repository/php-src/ext/pdo_sqlite/sqlite/src/Attic/keywordhash.h,v 1.2.2.1.2.5 2009/04/27 19:54:34 felipe Exp $ ** ** The code in this file implements a function that determines whether ** or not a given identifier is really an SQL keyword. The same thing http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.55r2=1.164.2.33.2.56diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.55 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.56 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.55 Wed Dec 31 11:17:42 2008 +++ php-src/ext/reflection/php_reflection.c Mon Apr 27 19:54:34 2009 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.55 2008/12/31 11:17:42 sebastian Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.56 2009/04/27 19:54:34 felipe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -1122,7 +1122,7 @@ MAKE_STD_ZVAL(name); MAKE_STD_ZVAL(classname); ZVAL_STRING(name, method-common.function_name, 1); - ZVAL_STRINGL(classname, ce-name, ce-name_length, 1); + ZVAL_STRINGL(classname, method-common.scope-name, method-common.scope-name_length, 1); reflection_instantiate(reflection_method_ptr, object TSRMLS_CC); intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC); intern-ptr = method; @@ -1164,7 +1164,7 @@ MAKE_STD_ZVAL(name); MAKE_STD_ZVAL(classname); ZVAL_STRING(name, prop_name, 1); - ZVAL_STRINGL(classname, ce-name, ce-name_length, 1); + ZVAL_STRINGL(classname, prop-ce-name, prop-ce-name_length, 1); reflection_instantiate(reflection_property_ptr, object TSRMLS_CC); intern = (reflection_object *) zend_object_store_get_object(object TSRMLS_CC); @@ -2249,11 +2249,6 @@ zval_dtor(ztmp); } - MAKE_STD_ZVAL(classname); - ZVAL_STRINGL(classname, ce-name, ce-name_length, 1); - - zend_hash_update(Z_OBJPROP_P(object), class,
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
felipe Mon Apr 27 20:03:16 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1476r2=1.2027.2.547.2.1477diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1476 php-src/NEWS:1.2027.2.547.2.1477 --- php-src/NEWS:1.2027.2.547.2.1476Mon Apr 27 18:38:57 2009 +++ php-src/NEWSMon Apr 27 20:03:16 2009 @@ -53,6 +53,7 @@ addresses in the filter extension). (Ilia) - Fixed bug #47430 (Errors after writing to nodeValue parameter of an absent previousSibling). (Rob) +- Fixed bug #47254 (Wrong Reflection for extends class). (Felipe) - Fixed bug #46882 (Serialize / Unserialize misbehaviour under OS with different bit numbers). (Matt) - Fixed bug #45799 (imagepng() crashes on empty image). (Martin McNickle, -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/sqlite3 php_sqlite3_structs.h sqlite3.c
Scott MacVicar wrote: scottmac Mon Apr 27 18:16:46 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3 php_sqlite3_structs.h sqlite3.c Log: MFH Add the ability to enable exceptions rather than warnings for sqlite3, needed for pyrus. Muchas Gracias :) Greg -- 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/pdo_sqlite/sqlite/src keywordhash.h /ext/reflection php_reflection.c /ext/reflection/tests 002.phpt ReflectionClass_getMethod_001.phpt ReflectionClass_getMet
Felipe Pena kirjoitti: felipe Mon Apr 27 19:54:35 2009 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2 FlexLexer.h flex.skl /php-src/ext/pdo_sqlite/sqlite/src keywordhash.h Eh..why were these files touched..? :) --Jani /php-src/ext/reflection php_reflection.c /php-src/ext/reflection/tests 002.phpt ReflectionClass_getMethod_001.phpt ReflectionClass_getMethods_001.phpt ReflectionClass_getProperties_001.phpt ReflectionClass_getProperty_001.phpt ReflectionClass_getProperty_003.phpt ReflectionClass_getProperty_004.phpt ReflectionMethod_getModifiers_basic.phpt Log: - MFH: Fixed bug #47254 (Wrong Reflection for extends class) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase rtTestConfiguration.php
zoe Mon Apr 27 21:04:33 2009 UTC
Modified files:
/phpruntests/src/testcase rtTestConfiguration.php
Log:
Start of POST implementation
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/rtTestConfiguration.php?r1=1.6r2=1.7diff_format=u
Index: phpruntests/src/testcase/rtTestConfiguration.php
diff -u phpruntests/src/testcase/rtTestConfiguration.php:1.6
phpruntests/src/testcase/rtTestConfiguration.php:1.7
--- phpruntests/src/testcase/rtTestConfiguration.php:1.6Sun Apr 26
22:43:36 2009
+++ phpruntests/src/testcase/rtTestConfiguration.phpMon Apr 27 21:04:32 2009
@@ -21,6 +21,7 @@
private $phpCommandLineArguments;
private $testCommandLineArguments;
private $phpExecutable;
+private $inputFileString;
private $isCgiTest = false;
private $cgiSections = array(
'GET',
@@ -45,7 +46,8 @@
$this-setPhpCommandLineArguments($runConfiguration, $sections);
$this-setTestCommandLineArguments($sections);
$this-setPhpExecutable($runConfiguration, $sectionHeadings);
-
+$this-setInputFileString($runConfiguration, $sections,
$sectionHeadings);
+
if($this-isCgiTest) {
$this-environmentVariables['SCRIPT_FILENAME'] =
$fileSection-getFileName();
$this-environmentVariables['PATH_TRANSLATED'] =
$fileSection-getFileName();
@@ -57,6 +59,7 @@
private function setEnvironmentVariables(rtRuntestsConfiguration
$runConfiguration, $sections, $fileSection)
{
$this-environmentVariables =
$runConfiguration-getEnvironmentVariables();
+
if (array_key_exists('ENV', $sections)) {
$this-environmentVariables =
array_merge($this-environmentVariables,
$sections['ENV']-getTestEnvironmentVariables());
}
@@ -94,6 +97,14 @@
}
}
+private function setInputFileString($runConfiguration, $sections,
$sectionHeadings)
+{
+$this-inputFileString = '';
+if(in_array('POST', $sectionHeadings)) {
+$this-inputFileString = ' '.$sections['POST']-getPostFileName();
+}
+}
+
private function queryCgiTest($sectionHeadings)
{
$tempArray = array_diff($this-cgiSections, $sectionHeadings);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src rtClassMap.php
zoe Mon Apr 27 21:05:33 2009 UTC Modified files: /phpruntests/srcrtClassMap.php Log: Start of POST implementation http://cvs.php.net/viewvc.cgi/phpruntests/src/rtClassMap.php?r1=1.2r2=1.3diff_format=u Index: phpruntests/src/rtClassMap.php diff -u phpruntests/src/rtClassMap.php:1.2 phpruntests/src/rtClassMap.php:1.3 --- phpruntests/src/rtClassMap.php:1.2 Sun Apr 26 07:38:11 2009 +++ phpruntests/src/rtClassMap.php Mon Apr 27 21:05:33 2009 @@ -59,6 +59,7 @@ 'rtEnvSection' = 'testcase/sections/configurationsections/rtEnvSection.php', 'rtGetSection' = 'testcase/sections/configurationsections/rtGetSection.php', 'rtIniSection' = 'testcase/sections/configurationsections/rtIniSection.php', +'rtPostSection'= 'testcase/sections/configurationsections/rtPostSection.php', 'rtCleanSection' = 'testcase/sections/executablesections/rtCleanSection.php', 'rtFileSection'= 'testcase/sections/executablesections/rtFileSection.php', 'rtSkipIfSection' = 'testcase/sections/executablesections/rtSkipIfSection.php', -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/configurationsections rtGetSection.php rtPostSection.php
zoe Mon Apr 27 21:05:54 2009 UTC
Added files:
/phpruntests/src/testcase/sections/configurationsections
rtPostSection.php
Modified files:
/phpruntests/src/testcase/sections/configurationsections
rtGetSection.php
Log:
Start of POST implementation
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtGetSection.php?r1=1.2r2=1.3diff_format=u
Index: phpruntests/src/testcase/sections/configurationsections/rtGetSection.php
diff -u
phpruntests/src/testcase/sections/configurationsections/rtGetSection.php:1.2
phpruntests/src/testcase/sections/configurationsections/rtGetSection.php:1.3
---
phpruntests/src/testcase/sections/configurationsections/rtGetSection.php:1.2
Sun Apr 26 22:44:23 2009
+++ phpruntests/src/testcase/sections/configurationsections/rtGetSection.php
Mon Apr 27 21:05:54 2009
@@ -1,17 +1,6 @@
?php
/**
* rtGetSection
- *
- * @category Testing
- * @package RUNTESTS
- * @authorZoe Slattery z...@php.net
- * @authorStefan Priebsch sprieb...@php.net
- * @copyright 2009 The PHP Group
- * @license http://www.php.net/license/3_01.txt PHP License 3.01
- * @link http://qa.php.net/
- */
-
-/**
* Sets environment variables for GET section
*
*
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/configurationsections/rtPostSection.php?view=markuprev=1.1
Index: phpruntests/src/testcase/sections/configurationsections/rtPostSection.php
+++ phpruntests/src/testcase/sections/configurationsections/rtPostSection.php
?php
/**
* rtPostSection
* Sets environment variables for GET section
*
*
* @category Testing
* @package RUNTESTS
* @authorZoe Slattery z...@php.net
* @authorStefan Priebsch sprieb...@php.net
* @copyright 2009 The PHP Group
* @license http://www.php.net/license/3_01.txt PHP License 3.01
* @link http://qa.php.net/
*/
class rtPostSection extends rtConfigurationSection
{
private $postVariables = array();
private $postFileName;
protected function init()
{
$this-postVariables['CONTENT_TYPE'] =
'application/x-www-form-urlencoded';
$this-postVariables['REQUEST_METHOD'] = 'POST';
$postString = implode('\n', $this-sectionContents);
$this-postFileName = tempnam(sys_get_temp_dir(), 'post');
file_put_contents($this-postFileName, $postString);
}
/**
* Additional GET environment variables required by the test
*
* @return array
*/
public function getPostVariables()
{
return $this-postVariables;
}
public function getPostFileName()
{
return $this-postFileName;
}
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /src/testcase/sections/executablesections rtFileSection.php
zoe Mon Apr 27 21:06:20 2009 UTC
Modified files:
/phpruntests/src/testcase/sections/executablesections
rtFileSection.php
Log:
Fixing comment block
http://cvs.php.net/viewvc.cgi/phpruntests/src/testcase/sections/executablesections/rtFileSection.php?r1=1.5r2=1.6diff_format=u
Index: phpruntests/src/testcase/sections/executablesections/rtFileSection.php
diff -u
phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.5
phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.6
--- phpruntests/src/testcase/sections/executablesections/rtFileSection.php:1.5
Sun Apr 26 22:44:35 2009
+++ phpruntests/src/testcase/sections/executablesections/rtFileSection.php
Mon Apr 27 21:06:20 2009
@@ -1,17 +1,6 @@
?php
/**
* rtFileSection
- *
- * @category Testing
- * @package RUNTESTS
- * @authorZoe Slattery z...@php.net
- * @authorStefan Priebsch sprieb...@php.net
- * @copyright 2009 The PHP Group
- * @license http://www.php.net/license/3_01.txt PHP License 3.01
- * @link http://qa.php.net/
- */
-
-/**
* Executes the code in the --FILE-- section
*
*
@@ -39,8 +28,7 @@
$phpExecutable = $testCase-testConfiguration-getPhpExecutable();
-
-// The CGI excutable is null if it is not available, check and SKIP if
asubstrppropriate
+// The CGI excutable is null if it is not available, check and SKIP if
necessary
if ($phpExecutable != null) {
$phpCommand = $phpExecutable;
$phpCommand .= ' '.
$testCase-testConfiguration-getPhpCommandLineArguments();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: phpruntests /tests/testcase/sections/configurationsections rtPostSectionTest.php
zoe Mon Apr 27 21:06:34 2009 UTC
Added files:
/phpruntests/tests/testcase/sections/configurationsections
rtPostSectionTest.php
Log:
Start of POST implementation
http://cvs.php.net/viewvc.cgi/phpruntests/tests/testcase/sections/configurationsections/rtPostSectionTest.php?view=markuprev=1.1
Index:
phpruntests/tests/testcase/sections/configurationsections/rtPostSectionTest.php
+++
phpruntests/tests/testcase/sections/configurationsections/rtPostSectionTest.php
?php
require_once 'PHPUnit/Framework.php';
require_once dirname(__FILE__) . '../../../../../src/rtAutoload.php';
class rtPostSectionTest extends PHPUnit_Framework_TestCase
{
public function testCreateInstance()
{
$postSection = new rtPostSection('POST',
array('hello=Worldgoodbye=MrChips'));
$envVars = $postSection-getPostVariables();
$this-assertEquals('POST', $envVars['REQUEST_METHOD']);
$fileName = $postSection-getPostFileName();
$string = file_get_contents($fileName);
$this-assertEquals('hello=Worldgoodbye=MrChips', $string);
}
}
?
--
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/pdo_sqlite/sqlite/src keywordhash.h /ext/reflection php_reflection.c /ext/reflection/tests 002.phpt ReflectionClass_getMethod_001.phpt ReflectionClass_getMeth
Em Seg, 2009-04-27 às 23:20 +0300, Jani Taskinen escreveu: Felipe Pena kirjoitti: felipe Mon Apr 27 19:54:35 2009 UTC Modified files: (Branch: PHP_5_2) /ZendEngine2FlexLexer.h flex.skl /php-src/ext/pdo_sqlite/sqlite/src keywordhash.h Eh..why were these files touched..? :) Well, I also don't know. :D -- Regards, Felipe Pena -- 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/intl/msgformat msgformat_attr.c
iliaa Mon Apr 27 23:22:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/msgformat msgformat_attr.c
Log:
Removed unused variable
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat_attr.c?r1=1.1.2.5r2=1.1.2.6diff_format=u
Index: php-src/ext/intl/msgformat/msgformat_attr.c
diff -u php-src/ext/intl/msgformat/msgformat_attr.c:1.1.2.5
php-src/ext/intl/msgformat/msgformat_attr.c:1.1.2.6
--- php-src/ext/intl/msgformat/msgformat_attr.c:1.1.2.5 Wed Apr 22 12:35:22 2009
+++ php-src/ext/intl/msgformat/msgformat_attr.c Mon Apr 27 23:22:16 2009
@@ -33,7 +33,6 @@
*/
PHP_FUNCTION( msgfmt_get_pattern )
{
- UChar value_buf[64];
MSG_FORMAT_METHOD_INIT_VARS;
/* Parse parameters. */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
