[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Aug 2 01:32:20 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3125r2=1.3126diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3125 php-src/ChangeLog:1.3126 --- php-src/ChangeLog:1.3125Fri Aug 1 01:32:06 2008 +++ php-src/ChangeLog Sat Aug 2 01:32:18 2008 @@ -1,3 +1,831 @@ +2008-08-01 Moriyoshi Koizumi [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/mbstring/libmbfl/mbfl/mbfilter.c + ext/mbstring/libmbfl/mbfl/mbfilter.c + ext/mbstring/tests/bug43993.phpt + ext/mbstring/tests/bug43993.phpt: + - MFH: Fixed bug #43993 (mb_substr_count() behaves differently to + substr_count() with overlapping needles) + +* ext/mbstring/tests/bug43993.phpt + ext/mbstring/tests/bug43993.phpt + ext/mbstring/tests/bug43993.phpt: +1.1.4; + - Add a test for bug #43993. + +* ext/mbstring/libmbfl/mbfl/mbfilter.c: + - Fixed bug #43993 (mb_substr_count() behaves differently to substr_count() + with overlapping needles) + +* (PHP_5_2) + ext/mbstring/mbstring.c: + - Move finalization code to the proper place + +2008-08-01 Stanislav Malyshev [EMAIL PROTECTED] + +* ZendEngine2/zend_alloc.c + ZendEngine2/zend_alloc.c: + remove unneeded define + +2008-08-01 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/gettext/config.w32: + - use static lib first if found + +* (PHP_5_3) + ext/pdo_oci/config.w32: + - MFH: fix EOL broken by previous commit + +* ext/pdo_oci/config.w32: + - fix EOL broken by previous commit + +* (PHP_5_3) + ext/pdo_oci/config.w32: + drop 8.x support + +2008-08-01 Steph Fox [EMAIL PROTECTED] + +* ext/phar/tests/cache_list/.cvsignore + ext/phar/tests/cache_list/frontcontroller1.phpt + ext/phar/tests/cache_list/frontcontroller10.phpt + ext/phar/tests/cache_list/frontcontroller11.phpt + ext/phar/tests/cache_list/frontcontroller12.phpt + ext/phar/tests/cache_list/frontcontroller13.phpt + ext/phar/tests/cache_list/frontcontroller14.phpt + ext/phar/tests/cache_list/frontcontroller15.phpt + ext/phar/tests/cache_list/frontcontroller16.phpt + ext/phar/tests/cache_list/frontcontroller17.phpt + ext/phar/tests/cache_list/frontcontroller18.phpt + ext/phar/tests/cache_list/frontcontroller19.phpt + ext/phar/tests/cache_list/frontcontroller2.phpt + ext/phar/tests/cache_list/frontcontroller20.phpt + ext/phar/tests/cache_list/frontcontroller21.phpt + ext/phar/tests/cache_list/frontcontroller22.phpt + ext/phar/tests/cache_list/frontcontroller23.phpt + ext/phar/tests/cache_list/frontcontroller24.phpt + ext/phar/tests/cache_list/frontcontroller25.phpt + ext/phar/tests/cache_list/frontcontroller26.phpt + ext/phar/tests/cache_list/frontcontroller27.phpt + ext/phar/tests/cache_list/frontcontroller28.phpt + ext/phar/tests/cache_list/frontcontroller29.phpt + ext/phar/tests/cache_list/frontcontroller3.phpt + ext/phar/tests/cache_list/frontcontroller30.phpt + ext/phar/tests/cache_list/frontcontroller31.phpt + ext/phar/tests/cache_list/frontcontroller32.phpt + ext/phar/tests/cache_list/frontcontroller33.phpt + ext/phar/tests/cache_list/frontcontroller34.phpt + ext/phar/tests/cache_list/frontcontroller4.phpt + ext/phar/tests/cache_list/frontcontroller5.phpt + ext/phar/tests/cache_list/frontcontroller6.phpt + ext/phar/tests/cache_list/frontcontroller7.phpt + ext/phar/tests/cache_list/frontcontroller8.phpt + ext/phar/tests/cache_list/frontcontroller9.phpt + ext/phar/tests/cache_list/files/frontcontroller.phar + ext/phar/tests/cache_list/files/frontcontroller10.phar + ext/phar/tests/cache_list/files/frontcontroller11.phar + ext/phar/tests/cache_list/files/frontcontroller12.phar + ext/phar/tests/cache_list/files/frontcontroller13.phar + ext/phar/tests/cache_list/files/frontcontroller14.phar + ext/phar/tests/cache_list/files/frontcontroller16.phar + ext/phar/tests/cache_list/files/frontcontroller17.phar + ext/phar/tests/cache_list/files/frontcontroller18.phar + ext/phar/tests/cache_list/files/frontcontroller19.phar + ext/phar/tests/cache_list/files/frontcontroller2.phar + ext/phar/tests/cache_list/files/frontcontroller3.phar + ext/phar/tests/cache_list/files/frontcontroller4.phar + ext/phar/tests/cache_list/files/frontcontroller5.phar + ext/phar/tests/cache_list/files/frontcontroller6.phar + ext/phar/tests/cache_list/files/frontcontroller7.phar + ext/phar/tests/cache_list/files/frontcontroller8.phar + ext/phar/tests/cache_list/files/frontcontroller9.phar: + - Somehow 'cvs add' managed to ignore these completely(?) + +* ext/phar/stream.c: + - Merge Dmitry's changes from PHP_5_3
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sat Aug 2 01:32:24 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1350r2=1.1351diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1350 ZendEngine2/ChangeLog:1.1351 --- ZendEngine2/ChangeLog:1.1350Fri Aug 1 01:32:11 2008 +++ ZendEngine2/ChangeLog Sat Aug 2 01:32:24 2008 @@ -1,3 +1,22 @@ +2008-08-01 Stanislav Malyshev [EMAIL PROTECTED] + +* zend_alloc.c + zend_alloc.c: + remove unneeded define + +2008-08-01 Dmitry Stogov [EMAIL PROTECTED] + +* zend_execute_API.c + zend_execute_API.c + zend_hash.c + zend_hash.c + zend_hash.h + zend_hash.h + tests/bug28072.phpt + tests/bug28072.phpt: + Fixed bug #44100 (Inconsistent handling of static array declarations with + duplicate keys). + 2008-07-31 Dmitry Stogov [EMAIL PROTECTED] * zend_compile.c @@ -25220,7 +25239,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1350 2008/08/01 01:32:11 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1351 2008/08/02 01:32:24 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -26944,7 +26963,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1350 2008/08/01 01:32:11 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1351 2008/08/02 01:32:24 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 config.m4 php_sqlite3.h
On 01.08.2008 02:24, Scott MacVicar wrote: scottmacThu Jul 31 22:24:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3 config.m4 php_sqlite3.h Log: Enable by default and fix compile error Do we really need to enable it by default? I know not of any people that need ext/sqlite, ext/sqlite3 and ext/pdo_sqlite in the same time (or any people that cannot enable them when needed). It's annoying to have to disable all those extra-useful extensions (which I've never ever used) each time I build PHP. -- Wbr, Antony Dovgal -- 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/sqlite3 config.m4 php_sqlite3.h
On 01.08.2008 02:24, Scott MacVicar wrote: scottmacThu Jul 31 22:24:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3 config.m4 php_sqlite3.h Log: Enable by default and fix compile error There are 16 tests in ext/sqlite3 failing with a segfault. Are you REALLY sure we need this extension enabled by default? --- (gdb) r ext/sqlite3/tests/sqlite3_03_insert.php Starting program: /local/dev/php/5_3/sapi/cli/php ext/sqlite3/tests/sqlite3_03_insert.php Creating Table bool(true) INSERT into table bool(true) bool(true) SELECTING results Program received signal SIGSEGV, Segmentation fault. 0x004e1a8b in zim_sqlite3result_fetchArray (ht=1, return_value=0xd07f80, return_value_ptr=0x0, this_ptr=0xd0cb00, return_value_used=1) at /local/dev/php/5_3/ext/sqlite3/sqlite3.c:1238 1238ret = sqlite3_step(result_obj-stmt_obj-stmt); (gdb) bt #0 0x004e1a8b in zim_sqlite3result_fetchArray (ht=1, return_value=0xd07f80, return_value_ptr=0x0, this_ptr=0xd0cb00, return_value_used=1) at /local/dev/php/5_3/ext/sqlite3/sqlite3.c:1238 #1 0x006adadd in zend_do_fcall_common_helper_SPEC (execute_data=0x2b3585f81090) at /local/dev/php/5_3/Zend/zend_vm_execute.h:313 #2 0x006ae86c in ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER (execute_data=0x2b3585f81090) at /local/dev/php/5_3/Zend/zend_vm_execute.h:422 #3 0x006acd29 in execute (op_array=0xd0c618) at /local/dev/php/5_3/Zend/zend_vm_execute.h:104 #4 0x0067e899 in zend_execute_scripts (type=8, retval=0x0, file_count=3) at /local/dev/php/5_3/Zend/zend.c:1199 #5 0x0060abb5 in php_execute_script (primary_file=0x7fff24c1fbe0) at /local/dev/php/5_3/main/main.c:2088 #6 0x00720458 in main (argc=2, argv=0x7fff24c1fe38) at /local/dev/php/5_3/sapi/cli/php_cli.c:1155 (gdb) f 0 #0 0x004e1a8b in zim_sqlite3result_fetchArray (ht=1, return_value=0xd07f80, return_value_ptr=0x0, this_ptr=0xd0cb00, return_value_used=1) at /local/dev/php/5_3/ext/sqlite3/sqlite3.c:1238 1238ret = sqlite3_step(result_obj-stmt_obj-stmt); (gdb) p result_obj $1 = (php_sqlite3_result *) 0x0 -- Wbr, Antony Dovgal -- 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/sqlite3/tests sqlite3_11_numrows.phpt
bjori Fri Aug 1 08:01:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3/tests sqlite3_11_numrows.phpt
Log:
Fix skipif (altough I can't find any such method in the source..?)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt
diff -u php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt:1.1.2.2
php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt:1.1.2.3
--- php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt:1.1.2.2 Sun Jul 27
00:05:36 2008
+++ php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt Fri Aug 1 08:01:31 2008
@@ -4,7 +4,7 @@
?php require_once(dirname(__FILE__) . '/skipif.inc');
// Create an instance of the ReflectionMethod class
try {
- $method = new ReflectionMethod('sqlite3_result', 'numRows');
+ $method = new ReflectionMethod('sqlite3result', 'numRows');
} catch (ReflectionException $e) {
die(skip);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3/tests sqlite3_11_numrows.phpt
bjori Fri Aug 1 08:02:07 2008 UTC
Modified files:
/php-src/ext/sqlite3/tests sqlite3_11_numrows.phpt
Log:
fix skipif
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt
diff -u php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt:1.2
php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt:1.3
--- php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt:1.2 Fri Jul 25
21:34:15 2008
+++ php-src/ext/sqlite3/tests/sqlite3_11_numrows.phpt Fri Aug 1 08:02:06 2008
@@ -4,7 +4,7 @@
?php require_once(dirname(__FILE__) . '/skipif.inc');
// Create an instance of the ReflectionMethod class
try {
- $method = new ReflectionMethod('sqlite3_result', 'numRows');
+ $method = new ReflectionMethod('sqlite3result', 'numRows');
} catch (ReflectionException $e) {
die(skip);
}
--
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/sqlite3 config.m4 php_sqlite3.h
On Fri, Aug 1, 2008 at 09:14, Antony Dovgal [EMAIL PROTECTED] wrote: On 01.08.2008 02:24, Scott MacVicar wrote: scottmacThu Jul 31 22:24:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3config.m4 php_sqlite3.h Log: Enable by default and fix compile error There are 16 tests in ext/sqlite3 failing with a segfault. All (except for one weird skip) pass for me. Are you REALLY sure we need this extension enabled by default? I think its only fair during alpha/beta/rc to have it enabled by default. I bet people would rather want to use sqlite3 then sqlite if they have a chance anyway. -Hannes -- 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/sqlite3 config.m4 php_sqlite3.h
On 01.08.2008 12:04, Hannes Magnusson wrote: Are you REALLY sure we need this extension enabled by default? I think its only fair during alpha/beta/rc to have it enabled by default. I bet people would rather want to use sqlite3 then sqlite if they have a chance anyway. What's the point in enabling it by default anyway? It's not similar to reflection or SPL which provide some basic functionality, it depends on a third-party library and no sane people would use it when there are other options (like MySQL which is installed on ALL hostings nowadays). -- Wbr, Antony Dovgal -- 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
tony2001Fri Aug 1 08:27:47 2008 UTC
Modified files:
/php-src/ext/sqlite3php_sqlite3_structs.h sqlite3.c
Log:
fix int-long mess causing lots of segfaults on x86_64
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/php_sqlite3_structs.h?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/sqlite3/php_sqlite3_structs.h
diff -u php-src/ext/sqlite3/php_sqlite3_structs.h:1.3
php-src/ext/sqlite3/php_sqlite3_structs.h:1.4
--- php-src/ext/sqlite3/php_sqlite3_structs.h:1.3 Tue Jul 29 00:56:22 2008
+++ php-src/ext/sqlite3/php_sqlite3_structs.h Fri Aug 1 08:27:46 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_sqlite3_structs.h,v 1.3 2008/07/29 00:56:22 scottmac Exp $ */
+/* $Id: php_sqlite3_structs.h,v 1.4 2008/08/01 08:27:46 tony2001 Exp $ */
#ifndef PHP_SQLITE_STRUCTS_H
#define PHP_SQLITE_STRUCTS_H
@@ -41,7 +41,7 @@
long param_number;
char *name;
int name_len;
- int type;
+ long type;
zval *parameter;
};
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.8 php-src/ext/sqlite3/sqlite3.c:1.9
--- php-src/ext/sqlite3/sqlite3.c:1.8 Thu Jul 31 16:35:33 2008
+++ php-src/ext/sqlite3/sqlite3.c Fri Aug 1 08:27:46 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.8 2008/07/31 16:35:33 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.9 2008/08/01 08:27:46 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -72,7 +72,8 @@
zval *object = getThis();
char *filename, *encryption_key, *fullpath;
zend_uchar filename_type;
- int filename_len, encryption_key_len, flags = SQLITE_OPEN_READWRITE |
SQLITE_OPEN_CREATE;
+ int filename_len, encryption_key_len;
+ long flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, t|lS,
filename, filename_len, filename_type, flags, encryption_key,
encryption_key_len)) {
@@ -536,7 +537,8 @@
php_sqlite3_db_object *db_obj;
zval *object = getThis();
char *sql, *errtext = NULL;
- int sql_len, return_code, entire_row = 0;
+ int sql_len, return_code;
+ zend_bool entire_row = 0;
sqlite3_stmt *stmt;
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
@@ -1145,7 +1147,7 @@
break;
default:
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, Unknown parameter type: %d for parameter %ld, param-type,
param-param_number);
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Unknown parameter type: %ld for parameter %ld, param-type,
param-param_number);
RETURN_FALSE;
}
zend_hash_move_forward(stmt_obj-bound_params);
@@ -1216,7 +1218,7 @@
{
php_sqlite3_result *result_obj;
zval *object = getThis();
- int column = 0;
+ long column = 0;
result_obj = (php_sqlite3_result *)zend_object_store_get_object(object
TSRMLS_CC);
SQLITE3_CHECK_INITIALIZED(result_obj-stmt_obj-initialised,
SQLite3_result)
@@ -1235,7 +1237,7 @@
{
php_sqlite3_result *result_obj;
zval *object = getThis();
- int column = 0;
+ long column = 0;
result_obj = (php_sqlite3_result *)zend_object_store_get_object(object
TSRMLS_CC);
SQLITE3_CHECK_INITIALIZED(result_obj-stmt_obj-initialised,
SQLite3_result)
@@ -1254,7 +1256,8 @@
{
php_sqlite3_result *result_obj;
zval *object = getThis();
- int i, ret, mode = PHP_SQLITE3_BOTH;
+ int i, ret;
+ long mode = PHP_SQLITE3_BOTH;
result_obj = (php_sqlite3_result *)zend_object_store_get_object(object
TSRMLS_CC);
SQLITE3_CHECK_INITIALIZED(result_obj-stmt_obj-initialised,
SQLite3_result)
--
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/sqlite3 php_sqlite3_structs.h sqlite3.c
tony2001Fri Aug 1 08:27:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3php_sqlite3_structs.h sqlite3.c
Log:
MFH: fix int-long mess causing lots of segfaults on x86_64
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/php_sqlite3_structs.h?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/sqlite3/php_sqlite3_structs.h
diff -u php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.4
php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.5
--- php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.4 Tue Jul 29 00:56:53 2008
+++ php-src/ext/sqlite3/php_sqlite3_structs.h Fri Aug 1 08:27:56 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_sqlite3_structs.h,v 1.1.2.4 2008/07/29 00:56:53 scottmac Exp $ */
+/* $Id: php_sqlite3_structs.h,v 1.1.2.5 2008/08/01 08:27:56 tony2001 Exp $ */
#ifndef PHP_SQLITE_STRUCTS_H
#define PHP_SQLITE_STRUCTS_H
@@ -41,7 +41,7 @@
long param_number;
char *name;
int name_len;
- int type;
+ long type;
zval *parameter;
};
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.7r2=1.1.2.8diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.7
php-src/ext/sqlite3/sqlite3.c:1.1.2.8
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.7 Thu Jul 31 22:30:26 2008
+++ php-src/ext/sqlite3/sqlite3.c Fri Aug 1 08:27:56 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.7 2008/07/31 22:30:26 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.8 2008/08/01 08:27:56 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -70,7 +70,8 @@
php_sqlite3_db_object *db_obj;
zval *object = getThis();
char *filename, *encryption_key, *fullpath;
- int filename_len, encryption_key_len, flags = SQLITE_OPEN_READWRITE |
SQLITE_OPEN_CREATE;
+ int filename_len, encryption_key_len;
+ long flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE;
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|ls,
filename, filename_len, flags, encryption_key, encryption_key_len)) {
@@ -518,7 +519,8 @@
php_sqlite3_db_object *db_obj;
zval *object = getThis();
char *sql, *errtext = NULL;
- int sql_len, return_code, entire_row = 0;
+ int sql_len, return_code;
+ zend_bool entire_row = 0;
sqlite3_stmt *stmt;
db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object
TSRMLS_CC);
@@ -1117,7 +1119,7 @@
break;
default:
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, Unknown parameter type: %d for parameter %ld, param-type,
param-param_number);
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Unknown parameter type: %ld for parameter %ld, param-type,
param-param_number);
RETURN_FALSE;
}
zend_hash_move_forward(stmt_obj-bound_params);
@@ -1188,7 +1190,7 @@
{
php_sqlite3_result *result_obj;
zval *object = getThis();
- int column = 0;
+ long column = 0;
result_obj = (php_sqlite3_result *)zend_object_store_get_object(object
TSRMLS_CC);
SQLITE3_CHECK_INITIALIZED(result_obj-stmt_obj-initialised,
SQLite3Result)
@@ -1207,7 +1209,7 @@
{
php_sqlite3_result *result_obj;
zval *object = getThis();
- int column = 0;
+ long column = 0;
result_obj = (php_sqlite3_result *)zend_object_store_get_object(object
TSRMLS_CC);
SQLITE3_CHECK_INITIALIZED(result_obj-stmt_obj-initialised,
SQLite3Result)
@@ -1226,7 +1228,8 @@
{
php_sqlite3_result *result_obj;
zval *object = getThis();
- int i, ret, mode = PHP_SQLITE3_BOTH;
+ int i, ret;
+ long mode = PHP_SQLITE3_BOTH;
result_obj = (php_sqlite3_result *)zend_object_store_get_object(object
TSRMLS_CC);
SQLITE3_CHECK_INITIALIZED(result_obj-stmt_obj-initialised,
SQLite3Result)
--
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/sqlite3 config.m4 php_sqlite3.h
On 1 Aug 2008, at 08:04, Antony Dovgal [EMAIL PROTECTED] wrote: On 01.08.2008 02:24, Scott MacVicar wrote: scottmacThu Jul 31 22:24:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3config.m4 php_sqlite3.h Log: Enable by default and fix compile error Do we really need to enable it by default? I know not of any people that need ext/sqlite, ext/sqlite3 and ext/ pdo_sqlite in the same time (or any people that cannot enable them when needed). It's annoying to have to disable all those extra-useful extensions (which I've never ever used) each time I build PHP. -- Wbr, Antony Dovgal ext/sqlite is based on sqlitev2. I'd remove it in a heartbeat if v3 could read the format pdo an sqlite3 use the same bundled lib so the increase in binary size is negligible. I'll catch you on IRC about the segfaults. 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) / php.ini-dist php.ini-recommended
bjori Fri Aug 1 10:59:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-dist php.ini-recommended Log: Add ini options for the new exts http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.22.2.8r2=1.231.2.10.2.22.2.9diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.22.2.8 php-src/php.ini-dist:1.231.2.10.2.22.2.9 --- php-src/php.ini-dist:1.231.2.10.2.22.2.8Sun Jul 27 16:37:57 2008 +++ php-src/php.ini-distFri Aug 1 10:59:14 2008 @@ -624,11 +624,13 @@ ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll +;extension=php_fileinfo.dll ;extension=php_fdf.dll ;extension=php_gd2.dll ;extension=php_gettext.dll ;extension=php_gmp.dll ;extension=php_ifx.dll +;extension=php_intl.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll @@ -653,12 +655,14 @@ ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll +;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll ;extension=php_snmp.dll ;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll +;extension=php_sqlite3.dll ;extension=php_sybase_ct.dll ;extension=php_tidy.dll ;extension=php_xmlrpc.dll @@ -688,9 +692,15 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 +[intl] +;intl.default_locale = + [sqlite] ;sqlite.assoc_case = 0 +[sqlite3] +;sqlite3.extension_dir = + [xmlrpc] ;xmlrpc_error_number = 0 ;xmlrpc_errors = 0 @@ -705,6 +715,11 @@ ;stack size limit imposed by the Operating System). ;pcre.recursion_limit=10 +[Phar] +;phar.readonly = On +;phar.require_hash = On +;phar.cache_list = + [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, ; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23.2.8r2=1.179.2.11.2.23.2.9diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23.2.8 php-src/php.ini-recommended:1.179.2.11.2.23.2.9 --- php-src/php.ini-recommended:1.179.2.11.2.23.2.8 Sun Jul 27 16:37:57 2008 +++ php-src/php.ini-recommended Fri Aug 1 10:59:14 2008 @@ -675,11 +675,13 @@ ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll +;extension=php_fileinfo.dll ;extension=php_fdf.dll ;extension=php_gd2.dll ;extension=php_gettext.dll ;extension=php_gmp.dll ;extension=php_ifx.dll +;extension=php_intl.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll @@ -704,12 +706,14 @@ ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll +;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll ;extension=php_snmp.dll ;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll +;extension=php_sqlite3.dll ;extension=php_sybase_ct.dll ;extension=php_tidy.dll ;extension=php_xmlrpc.dll @@ -739,9 +743,15 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 +[intl] +;intl.default_locale = + [sqlite] ;sqlite.assoc_case = 0 +[sqlite3] +;sqlite3.extension_dir = + [xmlrpc] ;xmlrpc_error_number = 0 ;xmlrpc_errors = 0 @@ -756,6 +766,11 @@ ;stack size limit imposed by the Operating System). ;pcre.recursion_limit=10 +[Phar] +;phar.readonly = On +;phar.require_hash = On +;phar.cache_list = + [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, ; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy config.w32
pajoye Fri Aug 1 11:21:28 2008 UTC
Modified files:
/php-src/ext/tidy config.w32
Log:
- first static lib then dyn or old one
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/config.w32?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/tidy/config.w32
diff -u php-src/ext/tidy/config.w32:1.2 php-src/ext/tidy/config.w32:1.3
--- php-src/ext/tidy/config.w32:1.2 Mon Mar 22 23:07:55 2004
+++ php-src/ext/tidy/config.w32 Fri Aug 1 11:21:27 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.2 2004/03/22 23:07:55 wez Exp $
+// $Id: config.w32,v 1.3 2008/08/01 11:21:27 pajoye Exp $
// vim:ft=javascript
ARG_WITH(tidy, TIDY support, no);
if (PHP_TIDY != no) {
- if (CHECK_LIB(libtidy.lib, tidy, PHP_TIDY)
+ if (CHECK_LIB(libtidy_a.lib;libtidy.lib, tidy, PHP_TIDY)
(
CHECK_HEADER_ADD_INCLUDE(tidy.h,
CFLAGS_TIDY) ||
CHECK_HEADER_ADD_INCLUDE(tidy/tidy.h,
CFLAGS_TIDY, null, null, true) ||
--
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/tidy config.w32
pajoye Fri Aug 1 11:21:50 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/tidy config.w32
Log:
- MFH: first static lib then dyn or old one
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/config.w32?r1=1.2r2=1.2.8.1diff_format=u
Index: php-src/ext/tidy/config.w32
diff -u php-src/ext/tidy/config.w32:1.2 php-src/ext/tidy/config.w32:1.2.8.1
--- php-src/ext/tidy/config.w32:1.2 Mon Mar 22 23:07:55 2004
+++ php-src/ext/tidy/config.w32 Fri Aug 1 11:21:50 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.2 2004/03/22 23:07:55 wez Exp $
+// $Id: config.w32,v 1.2.8.1 2008/08/01 11:21:50 pajoye Exp $
// vim:ft=javascript
ARG_WITH(tidy, TIDY support, no);
if (PHP_TIDY != no) {
- if (CHECK_LIB(libtidy.lib, tidy, PHP_TIDY)
+ if (CHECK_LIB(libtidy_a.lib;libtidy.lib, tidy, PHP_TIDY)
(
CHECK_HEADER_ADD_INCLUDE(tidy.h,
CFLAGS_TIDY) ||
CHECK_HEADER_ADD_INCLUDE(tidy/tidy.h,
CFLAGS_TIDY, null, null, true) ||
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32
pajoye Fri Aug 1 11:25:17 2008 UTC
Modified files:
/php-src/win32/buildconfig.w32
Log:
- add new default dir (old still works)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.81r2=1.82diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.81 php-src/win32/build/config.w32:1.82
--- php-src/win32/build/config.w32:1.81 Thu Jul 31 23:05:02 2008
+++ php-src/win32/build/config.w32 Fri Aug 1 11:25:16 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.81 2008/07/31 23:05:02 pajoye Exp $
+// $Id: config.w32,v 1.82 2008/08/01 11:25:16 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -209,20 +209,24 @@
ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this
source dir (..\\php_build) if not specified', 'no');
if (PHP_PHP_BUILD == 'no') {
- if (FSO.FolderExists(..\\php_build)) {
- PHP_PHP_BUILD = ..\\php_build;
+ if (FSO.FolderExists(..\\deps)) {
+ PHP_PHP_BUILD = ..\\deps;
} else {
- if (X64) {
- if (FSO.FolderExists(..\\win64build)) {
- PHP_PHP_BUILD = ..\\win64build;
- } else if
(FSO.FolderExists(..\\php-win64-dev\\php_build)) {
- PHP_PHP_BUILD = ..\\php-win64-dev\\php_build;
- }
+ if (FSO.FolderExists(..\\php_build)) {
+ PHP_PHP_BUILD = ..\\php_build;
} else {
- if (FSO.FolderExists(..\\win32build)) {
- PHP_PHP_BUILD = ..\\win32build;
- } else if
(FSO.FolderExists(..\\php-win32-dev\\php_build)) {
- PHP_PHP_BUILD = ..\\php-win32-dev\\php_build;
+ if (X64) {
+ if (FSO.FolderExists(..\\win64build)) {
+ PHP_PHP_BUILD = ..\\win64build;
+ } else if
(FSO.FolderExists(..\\php-win64-dev\\php_build)) {
+ PHP_PHP_BUILD =
..\\php-win64-dev\\php_build;
+ }
+ } else {
+ if (FSO.FolderExists(..\\win32build)) {
+ PHP_PHP_BUILD = ..\\win32build;
+ } else if
(FSO.FolderExists(..\\php-win32-dev\\php_build)) {
+ PHP_PHP_BUILD =
..\\php-win32-dev\\php_build;
+ }
}
}
}
--
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) /win32/build config.w32
pajoye Fri Aug 1 11:25:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfig.w32
Log:
- MFH: add new default dir (old still works)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.29r2=1.40.2.8.2.10.2.30diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.29
php-src/win32/build/config.w32:1.40.2.8.2.10.2.30
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.29 Thu Jul 31 23:05:52 2008
+++ php-src/win32/build/config.w32 Fri Aug 1 11:25:42 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.29 2008/07/31 23:05:52 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.30 2008/08/01 11:25:42 pajoye Exp $
// Master config file; think of it as a configure.in
// equivalent.
@@ -209,20 +209,24 @@
ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this
source dir (..\\php_build) if not specified', 'no');
if (PHP_PHP_BUILD == 'no') {
- if (FSO.FolderExists(..\\php_build)) {
- PHP_PHP_BUILD = ..\\php_build;
+ if (FSO.FolderExists(..\\deps)) {
+ PHP_PHP_BUILD = ..\\deps;
} else {
- if (X64) {
- if (FSO.FolderExists(..\\win64build)) {
- PHP_PHP_BUILD = ..\\win64build;
- } else if
(FSO.FolderExists(..\\php-win64-dev\\php_build)) {
- PHP_PHP_BUILD = ..\\php-win64-dev\\php_build;
- }
+ if (FSO.FolderExists(..\\php_build)) {
+ PHP_PHP_BUILD = ..\\php_build;
} else {
- if (FSO.FolderExists(..\\win32build)) {
- PHP_PHP_BUILD = ..\\win32build;
- } else if
(FSO.FolderExists(..\\php-win32-dev\\php_build)) {
- PHP_PHP_BUILD = ..\\php-win32-dev\\php_build;
+ if (X64) {
+ if (FSO.FolderExists(..\\win64build)) {
+ PHP_PHP_BUILD = ..\\win64build;
+ } else if
(FSO.FolderExists(..\\php-win64-dev\\php_build)) {
+ PHP_PHP_BUILD =
..\\php-win64-dev\\php_build;
+ }
+ } else {
+ if (FSO.FolderExists(..\\win32build)) {
+ PHP_PHP_BUILD = ..\\win32build;
+ } else if
(FSO.FolderExists(..\\php-win32-dev\\php_build)) {
+ PHP_PHP_BUILD =
..\\php-win32-dev\\php_build;
+ }
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite config.m4
scottmacFri Aug 1 12:02:40 2008 UTC Modified files: /php-src/ext/pdo_sqlite config.m4 Log: MFB: Make pdo_sqlite use the bundled extension with sqlite3 http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/config.m4?r1=1.39r2=1.40diff_format=u Index: php-src/ext/pdo_sqlite/config.m4 diff -u php-src/ext/pdo_sqlite/config.m4:1.39 php-src/ext/pdo_sqlite/config.m4:1.40 --- php-src/ext/pdo_sqlite/config.m4:1.39 Fri Jul 25 13:38:41 2008 +++ php-src/ext/pdo_sqlite/config.m4Fri Aug 1 12:02:40 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.39 2008/07/25 13:38:41 jani Exp $ +dnl $Id: config.m4,v 1.40 2008/08/01 12:02:40 scottmac Exp $ dnl config.m4 for extension pdo_sqlite dnl vim:et:sw=2:ts=2: @@ -72,21 +72,22 @@ PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_inc_path) else -# use bundled libs -pdo_sqlite_sources=libsqlite/sqlite3.c - + # use bundled libs if test $enable_maintainer_zts = yes; then -threadsafe_flag=-DSQLITE_THREADSAFE=1 +threadsafe_flags=-DSQLITE_THREADSAFE=1 else -threadsafe_flag=-DSQLITE_THREADSAFE=0 +threadsafe_flags=-DSQLITE_THREADSAFE=0 fi + other_flags=-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 + PHP_NEW_EXTENSION(pdo_sqlite, -$php_pdo_sqlite_sources_core $pdo_sqlite_sources, -$ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1 $threadsafe_flag -I$pdo_inc_path) +$php_pdo_sqlite_sources_core, +$ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags -I$pdo_inc_path) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) - PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1) + PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3) + PHP_ADD_INCLUDE($abs_srcdir/ext/sqlite3/libsqlite) AC_CHECK_FUNCS(usleep nanosleep) AC_CHECK_HEADERS(time.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/phar/phar clicommand.inc directorygraphiterator.inc directorytreeiterator.inc invertedregexiterator.inc phar.inc phar.php pharcommand.inc
sfoxFri Aug 1 13:42:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/phar clicommand.inc directorygraphiterator.inc
directorytreeiterator.inc
invertedregexiterator.inc phar.inc phar.php
pharcommand.inc
Log:
- Merge ws/cs fixes to bring all branches into sync
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/clicommand.inc?r1=1.23.4.3r2=1.23.4.4diff_format=u
Index: php-src/ext/phar/phar/clicommand.inc
diff -u php-src/ext/phar/phar/clicommand.inc:1.23.4.3
php-src/ext/phar/phar/clicommand.inc:1.23.4.4
--- php-src/ext/phar/phar/clicommand.inc:1.23.4.3 Fri Aug 1 06:16:35 2008
+++ php-src/ext/phar/phar/clicommand.incFri Aug 1 13:42:56 2008
@@ -4,7 +4,7 @@
* @ingroup Phar
* @brief class CLICommand
* @author Marcus Boerger
- * @date2007 - 2007
+ * @date2007 - 2008
*
* Phar Command
*/
@@ -57,6 +57,7 @@
break;
}
}
+
if (isset($this-args[''])) {
if ($i = $argc) {
if (isset($this-args['']['require'])
$this-args['']['require']) {
@@ -71,14 +72,14 @@
} else if ($i $argc) {
self::error(Unexpected default arguments to
command $command, check ${argv[0]} help\n);
}
-
+
foreach($this-args as $arg = $inf) {
if (strlen($arg) !isset($inf['val'])
isset($inf['required']) $inf['required']) {
$missing .= Missing parameter '-$arg'
to command $command, check ${argv[0]} help\n;
}
}
- if (strlen($missing))
- {
+
+ if (strlen($missing)) {
self::error($missing);
}
}
@@ -91,7 +92,7 @@
fprintf(STDERR, $msg);
}
- static function error ($msg, $exit_code = 1)
+ static function error ($msg, $exit_code = 1)
{
self::notice($msg);
exit($exit_code);
@@ -114,19 +115,14 @@
$r = new ReflectionClass($cmdclass);
$l = strlen($prefix);
- foreach($r-getMethods() as $m)
- {
- if (substr($m-name, 0, $l) == $prefix)
- {
- foreach($subs as $sub)
- {
+ foreach($r-getMethods() as $m) {
+ if (substr($m-name, 0, $l) == $prefix) {
+ foreach($subs as $sub) {
$what = substr($m-name,
$l+strlen($sub)+1);
$func = $prefix . $sub . '_' . $what;
$what = str_replace('_', '-', $what);
- if ($r-hasMethod($func))
- {
- if (!isset($a[$what]))
- {
+ if ($r-hasMethod($func)) {
+ if (!isset($a[$what])) {
$a[$what] = array();
}
$a[$what][$sub] = /*$m-class .
'::' .*/ $func;
@@ -152,8 +148,7 @@
return (bool)$arg;
}
-
- static function cli_arg_typ_int($arg, $cfg, $key)
+ static function cli_arg_typ_int($arg, $cfg, $key)
{
if ((int)$arg != $arg) {
self::error(Argument to -$key must be an integer.\n);
@@ -161,22 +156,16 @@
return (int)$arg;
}
-
+
static function cli_arg_typ_regex($arg, $cfg, $key)
{
- if (strlen($arg))
- {
- if (strlen($arg) 1 $arg[0] == $arg[strlen($arg)-1]
strpos('/,', $arg) !== false)
- {
+ if (strlen($arg)) {
+ if (strlen($arg) 1 $arg[0] == $arg[strlen($arg)-1]
strpos('/,', $arg) !== false) {
return $arg;
- }
- else
- {
+ } else {
return '/' . $arg . '/';
}
- }
- else
- {
+ } else {
return NULL;
}
}
@@ -203,8 +192,7 @@
{
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar stream.c
dmitry Fri Aug 1 14:22:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar stream.c Log: Fixed bug #44100 (Inconsistent handling of static array declarations with duplicate keys) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stream.c?r1=1.27.2.12r2=1.27.2.13diff_format=u Index: php-src/ext/phar/stream.c diff -u php-src/ext/phar/stream.c:1.27.2.12 php-src/ext/phar/stream.c:1.27.2.13 --- php-src/ext/phar/stream.c:1.27.2.12 Fri Aug 1 13:48:44 2008 +++ php-src/ext/phar/stream.c Fri Aug 1 14:22:48 2008 @@ -911,7 +911,7 @@ efree(entry-filename); entry-filename = new_key; entry-filename_len = new_key_len; - zend_hash_update_current_key_ex(phar-manifest, key_type, new_key, new_key_len, 0, NULL); + zend_hash_update_current_key_ex(phar-manifest, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); } } @@ -928,7 +928,7 @@ memcpy(new_key, resource_to-path + 1, to_len); memcpy(new_key + to_len, key + from_len, key_len - from_len); new_key[new_key_len] = 0; - zend_hash_update_current_key_ex(phar-virtual_dirs, key_type, new_key, new_key_len, 0, NULL); + zend_hash_update_current_key_ex(phar-virtual_dirs, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); efree(new_key); } } @@ -947,7 +947,7 @@ memcpy(new_key, resource_to-path + 1, to_len); memcpy(new_key + to_len, key + from_len, key_len - from_len); new_key[new_key_len] = 0; - zend_hash_update_current_key_ex(phar-mounted_dirs, key_type, new_key, new_key_len, 0, NULL); + zend_hash_update_current_key_ex(phar-mounted_dirs, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); efree(new_key); } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Fri Aug 1 14:31:17 2008 UTC Modified files: /CVSROOTavail Log: Karma for txforward and smantoor http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1429r2=1.1430diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1429 CVSROOT/avail:1.1430 --- CVSROOT/avail:1.1429Tue Jul 29 13:36:55 2008 +++ CVSROOT/avail Fri Aug 1 14:31:16 2008 @@ -153,7 +153,7 @@ avail|alan_k|php-src/ext/dio avail|chad,sesser|php-src/ext/filepro avail|askalski|php-src/ext/ftp -avail|jah,ttoohey|php-src/ext/gd +avail|jah,ttoohey,smantoor|php-src/ext/gd avail|alex|php-src/ext/gettext avail|steinm|php-src/ext/hyperwave avail|musone|php-src/ext/icap @@ -293,6 +293,7 @@ avail|joonas|pecl/llvm avail|indeyets|pecl/spread avail|akshat|pecl/cairo +avail|txforward|pecl/txforward # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 config.w32 php_oci8.h
pajoye Fri Aug 1 15:06:56 2008 UTC
Modified files:
/php-src/ext/oci8 config.w32 php_oci8.h
Log:
- support for Oracle 11g (either 8 or 11g can be built but not both
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.w32?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/oci8/config.w32
diff -u php-src/ext/oci8/config.w32:1.10 php-src/ext/oci8/config.w32:1.11
--- php-src/ext/oci8/config.w32:1.10Thu Jun 5 23:40:42 2008
+++ php-src/ext/oci8/config.w32 Fri Aug 1 15:06:56 2008
@@ -1,22 +1,82 @@
-// $Id: config.w32,v 1.10 2008/06/05 23:40:42 sixd Exp $
+// $Id: config.w32,v 1.11 2008/08/01 15:06:56 pajoye Exp $
// vim:ft=javascript
+if (PHP_OCI8 != no PHP_OCI8_11G != no) {
+ if (!PHP_OCI8_SHARED !PHP_OCI8_11G_SHARED) {
+ WARNING(oci8 and oci8-11g provide the same extension and
cannot both be built statically);
+ PHP_OCI8 = no
+ PHP_OCI8_11G = no
+ }
+}
+
ARG_WITH(oci8, OCI8 support, no);
if (PHP_OCI8 != no) {
- if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8, PHP_PHP_BUILD +
\\include\\instantclient; + PHP_OCI8)
- CHECK_LIB(oci.lib, oci8, PHP_PHP_BUILD +
\\lib\\instantclient; + PHP_OCI8)
-
- ) {
+ oci8_dirs = new Array(
+ PHP_OCI8
+ );
+
+ oci8_lib_paths = ;
+ oci8_inc_paths = ;
+
+ // find the Oracle install
+ for (i = 0; i oci8_dirs.length; i++) {
+ oci8_lib_paths += oci8_dirs[i] + \\lib;;
+ oci8_lib_paths += oci8_dirs[i] + \\lib\\msvc;;
+ oci8_inc_paths += oci8_dirs[i] + \\include;;
+ }
+
+ oci8_inc_paths += PHP_PHP_BUILD + \\include\\instantclient;
+ oci8_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient;;
+
+ if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8, oci8_inc_paths)
+ CHECK_LIB(oci.lib, oci8, oci8_lib_paths))
+ {
EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c
oci8_collection.c oci8_interface.c');
-
+
AC_DEFINE('HAVE_OCI8', 1);
AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);
AC_DEFINE('HAVE_OCI_LOB_READ2', 1);
-
+
} else {
- WARNING(oci8 not enabled; Oracle Database libraries or Oracle
10g Instant Client not found);
+ WARNING(oci8 not enabled: Oracle Database libraries or Oracle
10g Instant Client not found);
+ PHP_OCI8 = no
}
}
+ARG_WITH(oci8-11g, OCI8 support using Oracle 11g Instant Client, no);
+
+if (PHP_OCI8_11G != no) {
+
+ oci8_11g_dirs = new Array(
+ PHP_OCI8_11G
+ );
+
+ oci8_11g_lib_paths = ;
+ oci8_11g_inc_paths = ;
+
+ // find the Oracle install
+ for (i = 0; i oci8_11g_dirs.length; i++) {
+ oci8_11g_lib_paths += oci8_11g_dirs[i] + \\lib;;
+ oci8_11g_lib_paths += oci8_11g_dirs[i] + \\lib\\msvc;;
+ oci8_11g_inc_paths += oci8_11g_dirs[i] + \\include;;
+ }
+
+ oci8_11g_inc_paths += PHP_PHP_BUILD + \\include\\instantclient_11;
+ oci8_11g_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient_11;;
+
+ if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8_11G,
oci8_11g_inc_paths)
+ CHECK_LIB(oci.lib, oci8_11g, oci8_11g_lib_paths))
+ {
+ EXTENSION('oci8_11g', 'oci8.c oci8_lob.c oci8_statement.c
oci8_collection.c oci8_interface.c', null, null, null, ext\\oci8_11g)
+
+ AC_DEFINE('HAVE_OCI8', 1);
+ AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);
+ AC_DEFINE('HAVE_OCI_LOB_READ2', 1);
+
+ } else {
+ WARNING(oci8-11g not enabled: Oracle Database libraries or
Oracle 11g Instant Client not found);
+ PHP_OCI8_11G = no
+ }
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.49r2=1.50diff_format=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.49 php-src/ext/oci8/php_oci8.h:1.50
--- php-src/ext/oci8/php_oci8.h:1.49Sun Jul 27 17:48:16 2008
+++ php-src/ext/oci8/php_oci8.h Fri Aug 1 15:06:56 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8.h,v 1.49 2008/07/27 17:48:16 sixd Exp $ */
+/* $Id: php_oci8.h,v 1.50 2008/08/01 15:06:56 pajoye Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_H
@@ -43,7 +43,7 @@
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr oci8_module_entry
-
+#define phpext_oci8_11g_ptr oci8_module_entry
PHP_MINIT_FUNCTION(oci);
PHP_RINIT_FUNCTION(oci);
--
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/oci8 config.w32 php_oci8.h
pajoye Fri Aug 1 15:08:02 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 config.w32 php_oci8.h
Log:
- MFH: support for Oracle 11g (either 8 or 11g can be built but not both
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.w32?r1=1.3.4.2.2.2.2.2r2=1.3.4.2.2.2.2.3diff_format=u
Index: php-src/ext/oci8/config.w32
diff -u php-src/ext/oci8/config.w32:1.3.4.2.2.2.2.2
php-src/ext/oci8/config.w32:1.3.4.2.2.2.2.3
--- php-src/ext/oci8/config.w32:1.3.4.2.2.2.2.2 Thu Jun 5 23:43:10 2008
+++ php-src/ext/oci8/config.w32 Fri Aug 1 15:07:59 2008
@@ -1,14 +1,38 @@
-// $Id: config.w32,v 1.3.4.2.2.2.2.2 2008/06/05 23:43:10 sixd Exp $
+// $Id: config.w32,v 1.3.4.2.2.2.2.3 2008/08/01 15:07:59 pajoye Exp $
// vim:ft=javascript
+if (PHP_OCI8 != no PHP_OCI8_11G != no) {
+ if (!PHP_OCI8_SHARED !PHP_OCI8_11G_SHARED) {
+ WARNING(oci8 and oci8-11g provide the same extension and
cannot both be built statically);
+ PHP_OCI8 = no
+ PHP_OCI8_11G = no
+ }
+}
+
ARG_WITH(oci8, OCI8 support, no);
if (PHP_OCI8 != no) {
- if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8, PHP_PHP_BUILD +
\\include\\instantclient; + PHP_OCI8)
- CHECK_LIB(oci.lib, oci8, PHP_PHP_BUILD +
\\lib\\instantclient; + PHP_OCI8)
-
- ) {
+ oci8_dirs = new Array(
+ PHP_OCI8
+ );
+
+ oci8_lib_paths = ;
+ oci8_inc_paths = ;
+
+ // find the Oracle install
+ for (i = 0; i oci8_dirs.length; i++) {
+ oci8_lib_paths += oci8_dirs[i] + \\lib;;
+ oci8_lib_paths += oci8_dirs[i] + \\lib\\msvc;;
+ oci8_inc_paths += oci8_dirs[i] + \\include;;
+ }
+
+ oci8_inc_paths += PHP_PHP_BUILD + \\include\\instantclient;
+ oci8_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient;;
+
+ if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8, oci8_inc_paths)
+ CHECK_LIB(oci.lib, oci8, oci8_lib_paths))
+ {
EXTENSION('oci8', 'oci8.c oci8_lob.c oci8_statement.c
oci8_collection.c oci8_interface.c');
AC_DEFINE('HAVE_OCI8', 1);
@@ -16,7 +40,43 @@
AC_DEFINE('HAVE_OCI_LOB_READ2', 1);
} else {
- WARNING(oci8 not enabled; Oracle Database libraries or Oracle
10g Instant Client not found);
+ WARNING(oci8 not enabled: Oracle Database libraries or Oracle
10g Instant Client not found);
+ PHP_OCI8 = no
}
}
+ARG_WITH(oci8-11g, OCI8 support using Oracle 11g Instant Client, no);
+
+if (PHP_OCI8_11G != no) {
+
+ oci8_11g_dirs = new Array(
+ PHP_OCI8_11G
+ );
+
+ oci8_11g_lib_paths = ;
+ oci8_11g_inc_paths = ;
+
+ // find the Oracle install
+ for (i = 0; i oci8_11g_dirs.length; i++) {
+ oci8_11g_lib_paths += oci8_11g_dirs[i] + \\lib;;
+ oci8_11g_lib_paths += oci8_11g_dirs[i] + \\lib\\msvc;;
+ oci8_11g_inc_paths += oci8_11g_dirs[i] + \\include;;
+ }
+
+ oci8_11g_inc_paths += PHP_PHP_BUILD + \\include\\instantclient_11;
+ oci8_11g_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient_11;;
+
+ if (CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_OCI8_11G,
oci8_11g_inc_paths)
+ CHECK_LIB(oci.lib, oci8_11g, oci8_11g_lib_paths))
+ {
+ EXTENSION('oci8_11g', 'oci8.c oci8_lob.c oci8_statement.c
oci8_collection.c oci8_interface.c', null, null, null, ext\\oci8_11g)
+
+ AC_DEFINE('HAVE_OCI8', 1);
+ AC_DEFINE('HAVE_OCI_INSTANT_CLIENT', 1);
+ AC_DEFINE('HAVE_OCI_LOB_READ2', 1);
+
+ } else {
+ WARNING(oci8-11g not enabled: Oracle Database libraries or
Oracle 11g Instant Client not found);
+ PHP_OCI8_11G = no
+ }
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.36.2.2.2.1.2.9r2=1.36.2.2.2.1.2.10diff_format=u
Index: php-src/ext/oci8/php_oci8.h
diff -u php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.9
php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.10
--- php-src/ext/oci8/php_oci8.h:1.36.2.2.2.1.2.9Sun Jul 27 17:50:40 2008
+++ php-src/ext/oci8/php_oci8.h Fri Aug 1 15:07:59 2008
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.9 2008/07/27 17:50:40 sixd Exp $ */
+/* $Id: php_oci8.h,v 1.36.2.2.2.1.2.10 2008/08/01 15:07:59 pajoye Exp $ */
#if HAVE_OCI8
# ifndef PHP_OCI8_H
@@ -50,6 +50,7 @@
extern zend_module_entry oci8_module_entry;
#define phpext_oci8_ptr oci8_module_entry
+#define phpext_oci8_11g_ptr oci8_module_entry
PHP_MINIT_FUNCTION(oci);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar stream.c
sfoxFri Aug 1 16:28:19 2008 UTC Modified files: /php-src/ext/phar stream.c Log: - Merge Dmitry's changes from PHP_5_3 branch http://cvs.php.net/viewvc.cgi/php-src/ext/phar/stream.c?r1=1.32r2=1.33diff_format=u Index: php-src/ext/phar/stream.c diff -u php-src/ext/phar/stream.c:1.32 php-src/ext/phar/stream.c:1.33 --- php-src/ext/phar/stream.c:1.32 Fri Aug 1 13:45:06 2008 +++ php-src/ext/phar/stream.c Fri Aug 1 16:28:19 2008 @@ -916,7 +916,11 @@ entry-filename_len = new_key_len; PHAR_ZSTR(new_str_key, new_key); +#if PHP_VERSION_ID 50300 zend_hash_update_current_key_ex(phar-manifest, key_type, new_key, new_key_len, 0, NULL); +#else + zend_hash_update_current_key_ex(phar-manifest, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); +#endif efree(new_str_key); } } @@ -938,7 +942,11 @@ new_str_key[new_key_len] = 0; PHAR_ZSTR(new_str_key, new_key); +#if PHP_VERSION_ID 50300 zend_hash_update_current_key_ex(phar-virtual_dirs, key_type, new_key, new_key_len, 0, NULL); +#else + zend_hash_update_current_key_ex(phar-virtual_dirs, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); +#endif efree(new_str_key); } } @@ -961,7 +969,11 @@ new_str_key[new_key_len] = 0; PHAR_ZSTR(new_str_key, new_key); +#if PHP_VERSION_ID 50300 zend_hash_update_current_key_ex(phar-mounted_dirs, key_type, new_key, new_key_len, 0, NULL); +#else + zend_hash_update_current_key_ex(phar-mounted_dirs, key_type, new_key, new_key_len, 0, HASH_UPDATE_KEY_ANYWAY, NULL); +#endif efree(new_str_key); } } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar/tests/cache_list .cvsignore frontcontroller1.phpt frontcontroller10.phpt frontcontroller11.phpt frontcontroller12.phpt frontcontroller13.phpt frontcontroller14.phpt fr
sfoxFri Aug 1 17:34:03 2008 UTC
Modified files:
/php-src/ext/phar/tests/cache_list .cvsignore frontcontroller1.phpt
frontcontroller10.phpt
frontcontroller11.phpt
frontcontroller12.phpt
frontcontroller13.phpt
frontcontroller14.phpt
frontcontroller15.phpt
frontcontroller16.phpt
frontcontroller17.phpt
frontcontroller18.phpt
frontcontroller19.phpt
frontcontroller2.phpt
frontcontroller20.phpt
frontcontroller21.phpt
frontcontroller22.phpt
frontcontroller23.phpt
frontcontroller24.phpt
frontcontroller25.phpt
frontcontroller26.phpt
frontcontroller27.phpt
frontcontroller28.phpt
frontcontroller29.phpt
frontcontroller3.phpt
frontcontroller30.phpt
frontcontroller31.phpt
frontcontroller32.phpt
frontcontroller33.phpt
frontcontroller34.phpt
frontcontroller4.phpt
frontcontroller5.phpt
frontcontroller6.phpt
frontcontroller7.phpt
frontcontroller8.phpt
frontcontroller9.phpt
/php-src/ext/phar/tests/cache_list/filesfrontcontroller.phar
frontcontroller10.phar
frontcontroller11.phar
frontcontroller12.phar
frontcontroller13.phar
frontcontroller14.phar
frontcontroller16.phar
frontcontroller17.phar
frontcontroller18.phar
frontcontroller19.phar
frontcontroller2.phar
frontcontroller3.phar
frontcontroller4.phar
frontcontroller5.phar
frontcontroller6.phar
frontcontroller7.phar
frontcontroller8.phar
frontcontroller9.phar
Log:
- Somehow 'cvs add' managed to ignore these completely(?)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/.cvsignore?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/.cvsignore
diff -u /dev/null php-src/ext/phar/tests/cache_list/.cvsignore:1.2
--- /dev/null Fri Aug 1 17:34:03 2008
+++ php-src/ext/phar/tests/cache_list/.cvsignoreFri Aug 1 17:34:02 2008
@@ -0,0 +1,6 @@
+*.diff
+*.mem
+*.out
+*.php
+*.exp
+*.log
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/frontcontroller1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/frontcontroller1.phpt
diff -u /dev/null php-src/ext/phar/tests/cache_list/frontcontroller1.phpt:1.2
--- /dev/null Fri Aug 1 17:34:03 2008
+++ php-src/ext/phar/tests/cache_list/frontcontroller1.phpt Fri Aug 1
17:34:02 2008
@@ -0,0 +1,17 @@
+--TEST--
+Phar front controller other
+--INI--
+phar.cache_list={PWD}/frontcontroller1.php [cache_list]
+--SKIPIF--
+?php if (!extension_loaded(phar)) die(skip); ?
+--ENV--
+SCRIPT_NAME=/frontcontroller1.php
+REQUEST_URI=/frontcontroller1.php/a.jpg
+PATH_INFO=/a.jpg
+--FILE_EXTERNAL--
+files/frontcontroller.phar
+--EXPECTHEADERS--
+Content-type: image/jpeg
+Content-length: 3
+--EXPECT--
+hio
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/frontcontroller10.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/frontcontroller10.phpt
diff -u
[PHP-CVS] cvs: php-src /ext/pdo_oci config.w32
pajoye Fri Aug 1 18:58:15 2008 UTC
Modified files:
/php-src/ext/pdo_ociconfig.w32
Log:
- MFH: drop 8.x support
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.w32?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/pdo_oci/config.w32
diff -u php-src/ext/pdo_oci/config.w32:1.7 php-src/ext/pdo_oci/config.w32:1.8
--- php-src/ext/pdo_oci/config.w32:1.7 Thu May 11 21:48:57 2006
+++ php-src/ext/pdo_oci/config.w32 Fri Aug 1 18:58:15 2008
@@ -1,84 +1 @@
-// $Id: config.w32,v 1.7 2006/05/11 21:48:57 edink Exp $
-// vim:ft=javascript
-
-ARG_WITH(pdo-oci, Oracle OCI support for PDO, no);
-
-if (PHP_PDO_OCI != no) {
-
- pdo_oci_dirs = new Array(
- PHP_PDO_OCI,
- PHP_PDO_OCI + \\oci,
- PHP_PHP_BUILD + \\instantclient10_*\\sdk,
- PHP_PHP_BUILD + \\oci92
- );
-
- pdo_oci_lib_paths = ;
- pdo_oci_inc_paths = ;
-
- // find the oracle install
- for (i = 0; i pdo_oci_dirs.length; i++) {
- pdo_oci_lib_paths += pdo_oci_dirs[i] + \\lib;;
- pdo_oci_lib_paths += pdo_oci_dirs[i] + \\lib\\msvc;;
- pdo_oci_inc_paths += pdo_oci_dirs[i] + \\include;;
- }
-
- pdo_oci_inc_paths += PHP_PHP_BUILD + \\include\\instantclient;
- pdo_oci_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient;;
-
- pdo_oci_header = CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_PDO_OCI,
pdo_oci_inc_paths, null, null, true);
-
- if (pdo_oci_header CHECK_LIB(oci.lib, pdo_oci,
pdo_oci_lib_paths)) {
-
- pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
-
- EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c');
-
- /* probe for some functions not present in older versions */
- pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
- CHECK_FUNC_IN_HEADER('oci.h', 'OCIEnvCreate', pdo_oci_inc_dir,
'CFLAGS_PDO_OCI');
- CHECK_FUNC_IN_HEADER('ociap.h', 'OCIStmtFetch2',
pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
- CHECK_FUNC_IN_HEADER('ociap.h', 'OCIEnvNlsCreate',
pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
-
- } else {
- WARNING(pdo-oci not enabled; libraries and headers not found);
- }
- ADD_EXTENSION_DEP('pdo_oci', 'pdo');
-}
-
-ARG_WITH(pdo-oci8, Oracle OCI 8 (only) support for PDO, no);
-
-if (PHP_PDO_OCI8 != no) {
- pdo_oci_dirs = new Array(
- PHP_PDO_OCI,
- PHP_PHP_BUILD + \\oci805
- );
-
- pdo_oci_lib_paths = ;
- pdo_oci_inc_paths = ;
-
- // find the oracle install
- for (i = 0; i pdo_oci_dirs.length; i++) {
- pdo_oci_lib_paths += pdo_oci_dirs[i] + \\lib;;
- pdo_oci_lib_paths += pdo_oci_dirs[i] + \\lib\\msvc;;
- pdo_oci_inc_paths += pdo_oci_dirs[i] + \\include;;
- }
-
- pdo_oci_header = CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_PDO_OCI8,
pdo_oci_inc_paths, null, null, true);
-
- if (pdo_oci_header CHECK_LIB(oci.lib, pdo_oci8,
pdo_oci_lib_paths)) {
- pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
-
- EXTENSION('pdo_oci8', 'pdo_oci.c oci_driver.c oci_statement.c',
null, null, null, ext\\pdo_oci8);
-
- /* probe for some functions not present in older versions */
- pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
- CHECK_FUNC_IN_HEADER('oci.h', 'OCIEnvCreate', pdo_oci_inc_dir,
'CFLAGS_PDO_OCI8');
- CHECK_FUNC_IN_HEADER('ociap.h', 'OCIStmtFetch2',
pdo_oci_inc_dir, 'CFLAGS_PDO_OCI8');
- CHECK_FUNC_IN_HEADER('ociap.h', 'OCIEnvNlsCreate',
pdo_oci_inc_dir, 'CFLAGS_PDO_OCI8');
-
- } else {
- WARNING(pdo-oci8 not enabled; libraries and headers not
found);
- }
- ADD_EXTENSION_DEP('pdo_oci8', 'pdo');
-}
-
+// $Id: config.w32,v 1.8 2008/08/01 18:58:15 pajoye Exp $//
vim:ft=javascriptARG_WITH(pdo-oci, Oracle OCI support for PDO, no);if
(PHP_PDO_OCI != no) {pdo_oci_dirs = new Array(
PHP_PDO_OCI,PHP_PDO_OCI + \\oci, PHP_PHP_BUILD +
\\instantclient10_*\\sdk, PHP_PHP_BUILD + \\oci92 );
pdo_oci_lib_paths = ; pdo_oci_inc_paths = ; // find the oracle install
for (i = 0; i pdo_oci_dirs.length; i++) { pdo_oci_lib_paths +=
pdo_oci_dirs[i] + \\lib;;pdo_oci_lib_paths += pdo_oci_dirs[i]
+ \\lib\\msvc;; pdo_oci_inc_paths += pdo_oci_dirs[i] + \\include;;
} pdo_oci_inc_paths += PHP_PHP_BUILD +
\\include\\instantclient;pdo_oci_lib_paths += PHP_PHP_BUILD +
\\lib\\instantclient;; pdo_oci_header = CHECK_HEADER_ADD_INCLUDE(oci.h,
CFLAGS_PDO_OCI, pdo_oci_inc_paths, null, null, true); if (pdo_oci_header
CHECK_LIB(oci.lib, pdo_oci, pdo_oci_lib_paths)) {
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
[PHP-CVS] cvs: php-src /ext/pdo_oci config.w32
pajoye Fri Aug 1 19:09:15 2008 UTC
Modified files:
/php-src/ext/pdo_ociconfig.w32
Log:
- fix EOL broken by previous commit
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.w32?r1=1.8r2=1.9diff_format=u
Index: php-src/ext/pdo_oci/config.w32
diff -u php-src/ext/pdo_oci/config.w32:1.8 php-src/ext/pdo_oci/config.w32:1.9
--- php-src/ext/pdo_oci/config.w32:1.8 Fri Aug 1 18:58:15 2008
+++ php-src/ext/pdo_oci/config.w32 Fri Aug 1 19:09:15 2008
@@ -1 +1,46 @@
-// $Id: config.w32,v 1.8 2008/08/01 18:58:15 pajoye Exp $//
vim:ft=javascriptARG_WITH(pdo-oci, Oracle OCI support for PDO, no);if
(PHP_PDO_OCI != no) {pdo_oci_dirs = new Array(
PHP_PDO_OCI,PHP_PDO_OCI + \\oci, PHP_PHP_BUILD +
\\instantclient10_*\\sdk, PHP_PHP_BUILD + \\oci92 );
pdo_oci_lib_paths = ; pdo_oci_inc_paths = ; // find the oracle install
for (i = 0; i pdo_oci_dirs.length; i++) { pdo_oci_lib_paths +=
pdo_oci_dirs[i] + \\lib;;pdo_oci_lib_paths += pdo_oci_dirs[i]
+ \\lib\\msvc;; pdo_oci_inc_paths += pdo_oci_dirs[i] + \\include;;
} pdo_oci_inc_paths += PHP_PHP_BUILD +
\\include\\instantclient;pdo_oci_lib_paths += PHP_PHP_BUILD +
\\lib\\instantclient;; pdo_oci_header = CHECK_HEADER_ADD_INCLUDE(oci.h,
CFLAGS_PDO_OCI, pdo_oci_inc_paths, null, null, true); if (pdo_oci_header
CHECK_LIB(oci.lib, pdo_oci, pdo_oci_lib_paths)) {
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
EXTENSION('pdo_oci', 'pdo_oci.c oci_!
driver.c oci_statement.c');/* probe for some functions not present
in older versions */pdo_oci_inc_dir =
FSO.GetFolder(pdo_oci_header);CHECK_FUNC_IN_HEADER('oci.h',
'OCIEnvCreate', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
CHECK_FUNC_IN_HEADER('ociap.h', 'OCIStmtFetch2', pdo_oci_inc_dir,
'CFLAGS_PDO_OCI');CHECK_FUNC_IN_HEADER('ociap.h',
'OCIEnvNlsCreate', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI'); } else {
WARNING(pdo-oci not enabled; libraries and headers not found);}
ADD_EXTENSION_DEP('pdo_oci', 'pdo');}
\ No newline at end of file
+// $Id: config.w32,v 1.9 2008/08/01 19:09:15 pajoye Exp $
+// vim:ft=javascript
+
+ARG_WITH(pdo-oci, Oracle OCI support for PDO, no);
+
+if (PHP_PDO_OCI != no) {
+
+ pdo_oci_dirs = new Array(
+ PHP_PDO_OCI,
+ PHP_PDO_OCI + \\oci,
+ PHP_PHP_BUILD + \\instantclient10_*\\sdk,
+ PHP_PHP_BUILD + \\oci92
+ );
+
+ pdo_oci_lib_paths = ;
+ pdo_oci_inc_paths = ;
+
+ // find the oracle install
+ for (i = 0; i pdo_oci_dirs.length; i++) {
+ pdo_oci_lib_paths += pdo_oci_dirs[i] + \\lib;;
+ pdo_oci_lib_paths += pdo_oci_dirs[i] + \\lib\\msvc;;
+ pdo_oci_inc_paths += pdo_oci_dirs[i] + \\include;;
+ }
+
+ pdo_oci_inc_paths += PHP_PHP_BUILD + \\include\\instantclient;
+ pdo_oci_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient;;
+
+ pdo_oci_header = CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_PDO_OCI,
pdo_oci_inc_paths, null, null, true);
+
+ if (pdo_oci_header CHECK_LIB(oci.lib, pdo_oci,
pdo_oci_lib_paths)) {
+
+ pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
+
+ EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c');
+
+ /* probe for some functions not present in older versions */
+ pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
+ CHECK_FUNC_IN_HEADER('oci.h', 'OCIEnvCreate', pdo_oci_inc_dir,
'CFLAGS_PDO_OCI');
+ CHECK_FUNC_IN_HEADER('ociap.h', 'OCIStmtFetch2',
pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
+ CHECK_FUNC_IN_HEADER('ociap.h', 'OCIEnvNlsCreate',
pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
+
+ } else {
+ WARNING(pdo-oci not enabled; libraries and headers not found);
+ }
+ ADD_EXTENSION_DEP('pdo_oci', 'pdo');
+}
--
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/pdo_oci config.w32
pajoye Fri Aug 1 19:09:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_ociconfig.w32
Log:
- MFH: fix EOL broken by previous commit
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.w32?r1=1.6.4.1.2.1r2=1.6.4.1.2.2diff_format=u
Index: php-src/ext/pdo_oci/config.w32
diff -u php-src/ext/pdo_oci/config.w32:1.6.4.1.2.1
php-src/ext/pdo_oci/config.w32:1.6.4.1.2.2
--- php-src/ext/pdo_oci/config.w32:1.6.4.1.2.1 Fri Aug 1 18:57:30 2008
+++ php-src/ext/pdo_oci/config.w32 Fri Aug 1 19:09:47 2008
@@ -1 +1,46 @@
-// $Id: config.w32,v 1.6.4.1.2.1 2008/08/01 18:57:30 pajoye Exp $//
vim:ft=javascriptARG_WITH(pdo-oci, Oracle OCI support for PDO, no);if
(PHP_PDO_OCI != no) {pdo_oci_dirs = new Array(
PHP_PDO_OCI,PHP_PDO_OCI + \\oci, PHP_PHP_BUILD +
\\instantclient10_*\\sdk, PHP_PHP_BUILD + \\oci92 );
pdo_oci_lib_paths = ; pdo_oci_inc_paths = ; // find the oracle install
for (i = 0; i pdo_oci_dirs.length; i++) { pdo_oci_lib_paths +=
pdo_oci_dirs[i] + \\lib;;pdo_oci_lib_paths += pdo_oci_dirs[i]
+ \\lib\\msvc;; pdo_oci_inc_paths += pdo_oci_dirs[i] + \\include;;
} pdo_oci_inc_paths += PHP_PHP_BUILD +
\\include\\instantclient;pdo_oci_lib_paths += PHP_PHP_BUILD +
\\lib\\instantclient;; pdo_oci_header = CHECK_HEADER_ADD_INCLUDE(oci.h,
CFLAGS_PDO_OCI, pdo_oci_inc_paths, null, null, true); if (pdo_oci_header
CHECK_LIB(oci.lib, pdo_oci, pdo_oci_lib_paths)) {
pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
EXTENSION('pdo_oci', 'pdo_oc!
i.c oci_driver.c oci_statement.c');/* probe for some functions not
present in older versions */pdo_oci_inc_dir =
FSO.GetFolder(pdo_oci_header);CHECK_FUNC_IN_HEADER('oci.h',
'OCIEnvCreate', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
CHECK_FUNC_IN_HEADER('ociap.h', 'OCIStmtFetch2', pdo_oci_inc_dir,
'CFLAGS_PDO_OCI');CHECK_FUNC_IN_HEADER('ociap.h',
'OCIEnvNlsCreate', pdo_oci_inc_dir, 'CFLAGS_PDO_OCI'); } else {
WARNING(pdo-oci not enabled; libraries and headers not found);}
ADD_EXTENSION_DEP('pdo_oci', 'pdo');}
\ No newline at end of file
+// $Id: config.w32,v 1.6.4.1.2.2 2008/08/01 19:09:47 pajoye Exp $
+// vim:ft=javascript
+
+ARG_WITH(pdo-oci, Oracle OCI support for PDO, no);
+
+if (PHP_PDO_OCI != no) {
+
+ pdo_oci_dirs = new Array(
+ PHP_PDO_OCI,
+ PHP_PDO_OCI + \\oci,
+ PHP_PHP_BUILD + \\instantclient10_*\\sdk,
+ PHP_PHP_BUILD + \\oci92
+ );
+
+ pdo_oci_lib_paths = ;
+ pdo_oci_inc_paths = ;
+
+ // find the oracle install
+ for (i = 0; i pdo_oci_dirs.length; i++) {
+ pdo_oci_lib_paths += pdo_oci_dirs[i] + \\lib;;
+ pdo_oci_lib_paths += pdo_oci_dirs[i] + \\lib\\msvc;;
+ pdo_oci_inc_paths += pdo_oci_dirs[i] + \\include;;
+ }
+
+ pdo_oci_inc_paths += PHP_PHP_BUILD + \\include\\instantclient;
+ pdo_oci_lib_paths += PHP_PHP_BUILD + \\lib\\instantclient;;
+
+ pdo_oci_header = CHECK_HEADER_ADD_INCLUDE(oci.h, CFLAGS_PDO_OCI,
pdo_oci_inc_paths, null, null, true);
+
+ if (pdo_oci_header CHECK_LIB(oci.lib, pdo_oci,
pdo_oci_lib_paths)) {
+
+ pdo_oci_inc_dir = FSO.GetParentFolderName(pdo_oci_header);
+
+ EXTENSION('pdo_oci', 'pdo_oci.c oci_driver.c oci_statement.c');
+
+ /* probe for some functions not present in older versions */
+ pdo_oci_inc_dir = FSO.GetFolder(pdo_oci_header);
+ CHECK_FUNC_IN_HEADER('oci.h', 'OCIEnvCreate', pdo_oci_inc_dir,
'CFLAGS_PDO_OCI');
+ CHECK_FUNC_IN_HEADER('ociap.h', 'OCIStmtFetch2',
pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
+ CHECK_FUNC_IN_HEADER('ociap.h', 'OCIEnvNlsCreate',
pdo_oci_inc_dir, 'CFLAGS_PDO_OCI');
+
+ } else {
+ WARNING(pdo-oci not enabled; libraries and headers not found);
+ }
+ ADD_EXTENSION_DEP('pdo_oci', 'pdo');
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gettext config.w32
pajoye Fri Aug 1 21:19:46 2008 UTC
Modified files:
/php-src/ext/gettextconfig.w32
Log:
- use static lib first if found
http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/config.w32?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/gettext/config.w32
diff -u php-src/ext/gettext/config.w32:1.3 php-src/ext/gettext/config.w32:1.4
--- php-src/ext/gettext/config.w32:1.3 Sun Apr 9 23:15:57 2006
+++ php-src/ext/gettext/config.w32 Fri Aug 1 21:19:46 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.3 2006/04/09 23:15:57 edink Exp $
+// $Id: config.w32,v 1.4 2008/08/01 21:19:46 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gettext, gettext support, no);
if (PHP_GETTEXT != no) {
- if (CHECK_LIB(libintl.lib, gettext, PHP_GETTEXT)
CHECK_HEADER_ADD_INCLUDE(libintl.h, CFLAGS_GETTEXT)) {
+ if (CHECK_LIB(libintl_a.lib;libintl.lib, gettext, PHP_GETTEXT)
CHECK_HEADER_ADD_INCLUDE(libintl.h, CFLAGS_GETTEXT)) {
EXTENSION(gettext, gettext.c, PHP_GETTEXT_SHARED,
-DHAVE_BIND_TEXTDOMAIN_CODESET=1 -DHAVE_DNGETTEXT=1 -DHAVE_NGETTEXT=1
-DHAVE_LIBINTL=1 -DHAVE_DCNGETTEXT=1);
} else {
WARNING(gettext 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(PHP_5_3) /ext/gettext config.w32
pajoye Fri Aug 1 21:20:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/gettextconfig.w32
Log:
- MFH: use static lib first if found
http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/config.w32?r1=1.2.4.1r2=1.2.4.1.4.1diff_format=u
Index: php-src/ext/gettext/config.w32
diff -u php-src/ext/gettext/config.w32:1.2.4.1
php-src/ext/gettext/config.w32:1.2.4.1.4.1
--- php-src/ext/gettext/config.w32:1.2.4.1 Sun Apr 9 23:14:47 2006
+++ php-src/ext/gettext/config.w32 Fri Aug 1 21:20:08 2008
@@ -1,10 +1,10 @@
-// $Id: config.w32,v 1.2.4.1 2006/04/09 23:14:47 edink Exp $
+// $Id: config.w32,v 1.2.4.1.4.1 2008/08/01 21:20:08 pajoye Exp $
// vim:ft=javascript
ARG_WITH(gettext, gettext support, no);
if (PHP_GETTEXT != no) {
- if (CHECK_LIB(libintl.lib, gettext, PHP_GETTEXT)
CHECK_HEADER_ADD_INCLUDE(libintl.h, CFLAGS_GETTEXT)) {
+ if (CHECK_LIB(libintl_a.lib;libintl.lib, gettext, PHP_GETTEXT)
CHECK_HEADER_ADD_INCLUDE(libintl.h, CFLAGS_GETTEXT)) {
EXTENSION(gettext, gettext.c, PHP_GETTEXT_SHARED,
-DHAVE_BIND_TEXTDOMAIN_CODESET=1 -DHAVE_DNGETTEXT=1 -DHAVE_NGETTEXT=1
-DHAVE_LIBINTL=1 -DHAVE_DCNGETTEXT=1);
} else {
WARNING(gettext 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(PHP_5_2) /ext/mbstring mbstring.c
moriyoshi Fri Aug 1 22:53:21 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
Log:
- Move finalization code to the proper place
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.33r2=1.224.2.22.2.34diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.33
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.34
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.33 Sun Jul 13 01:36:15 2008
+++ php-src/ext/mbstring/mbstring.c Fri Aug 1 22:53:20 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.33 2008/07/13 01:36:15 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.34 2008/08/01 22:53:20 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -821,6 +821,18 @@
/* {{{ PHP_GSHUTDOWN_FUNCTION */
static PHP_GSHUTDOWN_FUNCTION(mbstring)
{
+ if (mbstring_globals-http_input_list) {
+ free(mbstring_globals-http_input_list);
+ }
+#ifdef ZEND_MULTIBYTE
+ if (mbstring_globals-script_encoding_list) {
+ free(mbstring_globals-script_encoding_list);
+ }
+#endif /* ZEND_MULTIBYTE */
+ if (mbstring_globals-detect_order_list) {
+ free(mbstring_globals-detect_order_list);
+ }
+
#if HAVE_MBREGEX
_php_mb_regex_globals_dtor(mbstring_globals TSRMLS_CC);
#endif
@@ -859,18 +871,6 @@
{
UNREGISTER_INI_ENTRIES();
- if (MBSTRG(http_input_list)) {
- free(MBSTRG(http_input_list));
- }
-#ifdef ZEND_MULTIBYTE
- if (MBSTRG(script_encoding_list)) {
- free(MBSTRG(script_encoding_list));
- }
-#endif /* ZEND_MULTIBYTE */
- if (MBSTRG(detect_order_list)) {
- free(MBSTRG(detect_order_list));
- }
-
#if HAVE_MBREGEX
PHP_MSHUTDOWN(mb_regex) (INIT_FUNC_ARGS_PASSTHRU);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/mbfl mbfilter.c
moriyoshi Fri Aug 1 22:55:47 2008 UTC
Modified files:
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- Fixed bug #43993 (mb_substr_count() behaves differently to substr_count()
with overlapping needles)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.14
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.15
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.14 Sun Aug 19 01:57:53 2007
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Aug 1 22:55:47 2008
@@ -1013,6 +1013,7 @@
if (pc.matched_pos = 0) {
++result;
pc.matched_pos = -1;
+ pc.needle_pos = 0;
}
n--;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/tests bug43993.phpt
moriyoshi Fri Aug 1 22:56:35 2008 UTC
Added files:
/php-src/ext/mbstring/tests bug43993.phpt
Log:
- Add a test for bug #43993.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug43993.phpt?view=markuprev=1.1
Index: php-src/ext/mbstring/tests/bug43993.phpt
+++ php-src/ext/mbstring/tests/bug43993.phpt
--TEST--
Bug #43993 (mb_substr_count() behaves differently to substr_count() with
overlapping needles)
--SKIPIF--
?php extension_loaded('mbstring') or die('skip mbstring not available'); ?
--FILE--
?php
var_dump(mb_substr_count(abcabcabca, abcabc));
var_dump(mb_substr_count(abcabcabca, abc));
var_dump(mb_substr_count(abcabcabca, cab));
var_dump(mb_substr_count(abcabcabca, bca));
var_dump(mb_substr_count(ababababab, ba));
var_dump(mb_substr_count(ababababab, ab));
var_dump(mb_substr_count(ababababab, bc));
var_dump(mb_substr_count(aa, a));
var_dump(mb_substr_count(aa, b));
?
--EXPECT--
int(1)
int(3)
int(2)
int(3)
int(4)
int(5)
int(0)
int(10)
int(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/mbstring/libmbfl/mbfl mbfilter.c /ext/mbstring/tests bug43993.phpt
moriyoshi Fri Aug 1 22:56:47 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mbstring/tests bug43993.phpt
Modified files:
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- MFH: Fixed bug #43993 (mb_substr_count() behaves differently to
substr_count() with overlapping needles)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.7.2.5.2.1r2=1.7.2.5.2.1.2.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.1.2.1
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.1Sun Aug 19
01:58:39 2007
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Aug 1 22:56:47 2008
@@ -1013,6 +1013,7 @@
if (pc.matched_pos = 0) {
++result;
pc.matched_pos = -1;
+ pc.needle_pos = 0;
}
n--;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug43993.phpt?view=markuprev=1.1
Index: php-src/ext/mbstring/tests/bug43993.phpt
+++ php-src/ext/mbstring/tests/bug43993.phpt
--TEST--
Bug #43993 (mb_substr_count() behaves differently to substr_count() with
overlapping needles)
--SKIPIF--
?php extension_loaded('mbstring') or die('skip mbstring not available'); ?
--FILE--
?php
var_dump(mb_substr_count(abcabcabca, abcabc));
var_dump(mb_substr_count(abcabcabca, abc));
var_dump(mb_substr_count(abcabcabca, cab));
var_dump(mb_substr_count(abcabcabca, bca));
var_dump(mb_substr_count(ababababab, ba));
var_dump(mb_substr_count(ababababab, ab));
var_dump(mb_substr_count(ababababab, bc));
var_dump(mb_substr_count(aa, a));
var_dump(mb_substr_count(aa, b));
?
--EXPECT--
int(1)
int(3)
int(2)
int(3)
int(4)
int(5)
int(0)
int(10)
int(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_2) / NEWS /ext/mbstring/libmbfl/mbfl mbfilter.c /ext/mbstring/tests bug43993.phpt
moriyoshi Fri Aug 1 22:58:20 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/mbstring/tests bug43993.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- MFH: Fixed bug #43993 (mb_substr_count() behaves differently to
substr_count() with overlapping needles)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1185r2=1.2027.2.547.2.1186diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1185 php-src/NEWS:1.2027.2.547.2.1186
--- php-src/NEWS:1.2027.2.547.2.1185Thu Jul 31 17:39:13 2008
+++ php-src/NEWSFri Aug 1 22:58:17 2008
@@ -58,6 +58,8 @@
(Dmitry, Tony)
- Fixed bug #44127 (UNIX abstract namespace socket connect does not work).
(Jani)
+- Fixed bug #43993 (mb_substr_count() behaves differently to substr_count()
with
+ overlapping needles). (Moriyoshi)
- Fixed bug #41348 (OCI8: allow compilation with Oracle 8.1). (Chris Jones)
01 May 2008, PHP 5.2.6
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.7.2.5.2.1r2=1.7.2.5.2.2diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.1Sun Aug 19
01:58:39 2007
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Aug 1 22:58:20 2008
@@ -1013,6 +1013,7 @@
if (pc.matched_pos = 0) {
++result;
pc.matched_pos = -1;
+ pc.needle_pos = 0;
}
n--;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug43993.phpt?view=markuprev=1.1
Index: php-src/ext/mbstring/tests/bug43993.phpt
+++ php-src/ext/mbstring/tests/bug43993.phpt
--TEST--
Bug #43993 (mb_substr_count() behaves differently to substr_count() with
overlapping needles)
--SKIPIF--
?php extension_loaded('mbstring') or die('skip mbstring not available'); ?
--FILE--
?php
var_dump(mb_substr_count(abcabcabca, abcabc));
var_dump(mb_substr_count(abcabcabca, abc));
var_dump(mb_substr_count(abcabcabca, cab));
var_dump(mb_substr_count(abcabcabca, bca));
var_dump(mb_substr_count(ababababab, ba));
var_dump(mb_substr_count(ababababab, ab));
var_dump(mb_substr_count(ababababab, bc));
var_dump(mb_substr_count(aa, a));
var_dump(mb_substr_count(aa, b));
?
--EXPECT--
int(1)
int(3)
int(2)
int(3)
int(4)
int(5)
int(0)
int(10)
int(0)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib zlib.c
lbarnaudSat Aug 2 02:36:14 2008 UTC
Modified files:
/php-src/ext/zlib zlib.c
Log:
Avoid leaks when zlib streams can not be closed properly.
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.219r2=1.220diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.219 php-src/ext/zlib/zlib.c:1.220
--- php-src/ext/zlib/zlib.c:1.219 Thu Jul 3 12:21:25 2008
+++ php-src/ext/zlib/zlib.c Sat Aug 2 02:36:14 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.219 2008/07/03 12:21:25 felipe Exp $ */
+/* $Id: zlib.c,v 1.220 2008/08/02 02:36:14 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -36,6 +36,19 @@
ZEND_DECLARE_MODULE_GLOBALS(zlib);
+/* {{{ Memory management wrappers */
+
+static voidpf php_zlib_alloc(voidpf opaque, uInt items, uInt size)
+{
+ return (voidpf)safe_emalloc(items, size, 0);
+}
+
+static void php_zlib_free(voidpf opaque, voidpf address)
+{
+ efree((void*)address);
+}
+/* }}} */
+
/* {{{ php_zlib_output_conflict_check() */
int php_zlib_output_conflict_check(zval *handler_name TSRMLS_DC)
{
@@ -104,12 +117,16 @@
php_output_handler *php_zlib_output_handler_init(zval *handler_name, size_t
chunk_size, int flags TSRMLS_DC)
{
php_output_handler *h = NULL;
+ php_zlib_context *ctx;
if (!ZLIBG(output_compression)) {
ZLIBG(output_compression) = chunk_size ? chunk_size :
PHP_OUTPUT_HANDLER_DEFAULT_SIZE;
}
if ((h = php_output_handler_create_internal(handler_name,
php_zlib_output_handler, chunk_size, flags TSRMLS_CC))) {
- php_output_handler_set_context(h, ecalloc(1,
sizeof(php_zlib_context)), php_zlib_output_handler_dtor TSRMLS_CC);
+ ctx = (php_zlib_context *) ecalloc(1, sizeof(php_zlib_context));
+ ctx-Z.zalloc = php_zlib_alloc;
+ ctx-Z.zfree = php_zlib_free;
+ php_output_handler_set_context(h, ctx,
php_zlib_output_handler_dtor TSRMLS_CC);
}
return h;
@@ -264,6 +281,8 @@
z_stream Z;
memset(Z, 0, sizeof(z_stream));
+ Z.zalloc = php_zlib_alloc;
+ Z.zfree = php_zlib_free;
if (Z_OK == (status = deflateInit2(Z, level, Z_DEFLATED, encoding,
MAX_MEM_LEVEL, Z_DEFAULT_STRATEGY))) {
*out_len = PHP_ZLIB_BUFFER_SIZE_GUESS(in_len);
@@ -347,6 +366,9 @@
z_stream Z;
memset(Z, 0, sizeof(z_stream));
+ Z.zalloc = php_zlib_alloc;
+ Z.zfree = php_zlib_free;
+
if (in_len) {
retry_raw_inflate:
status = inflateInit2(Z, encoding);
--
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/zlib zlib.c
lbarnaudSat Aug 2 02:36:25 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zlib zlib.c
Log:
MFH: Avoid leaks when zlib streams can not be closed properly.
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.5.2.4r2=1.183.2.6.2.5.2.5diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.4
php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.5
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.5.2.4 Thu Jul 24 14:38:37 2008
+++ php-src/ext/zlib/zlib.c Sat Aug 2 02:36:25 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.183.2.6.2.5.2.4 2008/07/24 14:38:37 lbarnaud Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.5.2.5 2008/08/02 02:36:25 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -218,6 +218,19 @@
ZEND_GET_MODULE(php_zlib)
#endif
+/* {{{ Memory management wrappers */
+
+static voidpf php_zlib_alloc(voidpf opaque, uInt items, uInt size)
+{
+ return (voidpf)safe_emalloc(items, size, 0);
+}
+
+static void php_zlib_free(voidpf opaque, voidpf address)
+{
+ efree((void*)address);
+}
+/* }}} */
+
/* {{{ OnUpdate_zlib_output_compression */
static PHP_INI_MH(OnUpdate_zlib_output_compression)
{
@@ -553,8 +566,8 @@
}
stream.data_type = Z_ASCII;
- stream.zalloc = (alloc_func) Z_NULL;
- stream.zfree = (free_func) Z_NULL;
+ stream.zalloc = php_zlib_alloc;
+ stream.zfree = php_zlib_free;
stream.opaque = (voidpf) Z_NULL;
stream.next_in = (Bytef *) data;
@@ -620,8 +633,8 @@
}
plength = limit;
- stream.zalloc = (alloc_func) Z_NULL;
- stream.zfree = (free_func) Z_NULL;
+ stream.zalloc = php_zlib_alloc;
+ stream.zfree = php_zlib_free;
stream.opaque = Z_NULL;
stream.avail_in = data_len + 1; /* there is room for \0 */
stream.next_in = (Bytef *) data;
@@ -746,8 +759,8 @@
int err;
if (do_start) {
- ZLIBG(stream).zalloc = Z_NULL;
- ZLIBG(stream).zfree = Z_NULL;
+ ZLIBG(stream).zalloc = php_zlib_alloc;
+ ZLIBG(stream).zfree = php_zlib_free;
ZLIBG(stream).opaque = Z_NULL;
switch (ZLIBG(compression_coding)) {
@@ -836,8 +849,8 @@
RETURN_FALSE;
}
- stream.zalloc = Z_NULL;
- stream.zfree = Z_NULL;
+ stream.zalloc = php_zlib_alloc;
+ stream.zfree = php_zlib_free;
stream.opaque = Z_NULL;
stream.next_in = (Bytef *) data;
--
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/zlib zlib.c
lbarnaudSat Aug 2 02:36:59 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zlib zlib.c
Log:
MFH: Avoid leaks when zlib streams can not be closed properly.
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib.c?r1=1.183.2.6.2.6r2=1.183.2.6.2.7diff_format=u
Index: php-src/ext/zlib/zlib.c
diff -u php-src/ext/zlib/zlib.c:1.183.2.6.2.6
php-src/ext/zlib/zlib.c:1.183.2.6.2.7
--- php-src/ext/zlib/zlib.c:1.183.2.6.2.6 Mon Dec 31 07:20:14 2007
+++ php-src/ext/zlib/zlib.c Sat Aug 2 02:36:59 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: zlib.c,v 1.183.2.6.2.6 2007/12/31 07:20:14 sebastian Exp $ */
+/* $Id: zlib.c,v 1.183.2.6.2.7 2008/08/02 02:36:59 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -156,6 +156,19 @@
ZEND_GET_MODULE(php_zlib)
#endif
+/* {{{ Memory management wrappers */
+
+static voidpf php_zlib_alloc(voidpf opaque, uInt items, uInt size)
+{
+ return (voidpf)safe_emalloc(items, size, 0);
+}
+
+static void php_zlib_free(voidpf opaque, voidpf address)
+{
+ efree((void*)address);
+}
+/* }}} */
+
/* {{{ OnUpdate_zlib_output_compression */
static PHP_INI_MH(OnUpdate_zlib_output_compression)
{
@@ -491,8 +504,8 @@
}
stream.data_type = Z_ASCII;
- stream.zalloc = (alloc_func) Z_NULL;
- stream.zfree = (free_func) Z_NULL;
+ stream.zalloc = php_zlib_alloc;
+ stream.zfree = php_zlib_free;
stream.opaque = (voidpf) Z_NULL;
stream.next_in = (Bytef *) data;
@@ -566,8 +579,8 @@
that should be enaugh for all real life cases
*/
- stream.zalloc = (alloc_func) Z_NULL;
- stream.zfree = (free_func) Z_NULL;
+ stream.zalloc = php_zlib_alloc;
+ stream.zfree = php_zlib_free;
do {
length = plength ? plength : (unsigned long)data_len * (1
factor++);
@@ -681,8 +694,8 @@
int err;
if (do_start) {
- ZLIBG(stream).zalloc = Z_NULL;
- ZLIBG(stream).zfree = Z_NULL;
+ ZLIBG(stream).zalloc = php_zlib_alloc;
+ ZLIBG(stream).zfree = php_zlib_free;
ZLIBG(stream).opaque = Z_NULL;
switch (ZLIBG(compression_coding)) {
@@ -771,8 +784,8 @@
RETURN_FALSE;
}
- stream.zalloc = Z_NULL;
- stream.zfree = Z_NULL;
+ stream.zalloc = php_zlib_alloc;
+ stream.zfree = php_zlib_free;
stream.opaque = Z_NULL;
stream.next_in = (Bytef *) data;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
bjori Fri Aug 1 11:01:11 2008 UTC Modified files: /php-srcphp.ini-recommended php.ini-dist Log: MFB5.3: INI options for new extions http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.226r2=1.227diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.226 php-src/php.ini-recommended:1.227 --- php-src/php.ini-recommended:1.226 Sun Jul 27 16:35:56 2008 +++ php-src/php.ini-recommended Fri Aug 1 11:01:11 2008 @@ -589,11 +589,13 @@ ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll +;extension=php_fileinfo.dll ;extension=php_fdf.dll ;extension=php_gd2.dll ;extension=php_gettext.dll ;extension=php_gmp.dll ;extension=php_ifx.dll +;extension=php_intl.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll @@ -618,12 +620,14 @@ ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll +;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll ;extension=php_snmp.dll ;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll +;extension=php_sqlite3.dll ;extension=php_sybase_ct.dll ;extension=php_tidy.dll ;extension=php_xmlrpc.dll @@ -653,9 +657,15 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 +[intl] +;intl.default_locale = + [sqlite] ;sqlite.assoc_case = 0 +[sqlite3] +;sqlite3.extension_dir = + [xmlrpc] ;xmlrpc_error_number = 0 ;xmlrpc_errors = 0 @@ -670,6 +680,11 @@ ;stack size limit imposed by the Operating System). ;pcre.recursion_limit=10 +[Phar] +;phar.readonly = On +;phar.require_hash = On +;phar.cache_list = + [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, ; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.276r2=1.277diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.276 php-src/php.ini-dist:1.277 --- php-src/php.ini-dist:1.276 Sun Jul 27 16:35:56 2008 +++ php-src/php.ini-distFri Aug 1 11:01:11 2008 @@ -552,11 +552,13 @@ ;extension=php_dba.dll ;extension=php_dbase.dll ;extension=php_exif.dll +;extension=php_fileinfo.dll ;extension=php_fdf.dll ;extension=php_gd2.dll ;extension=php_gettext.dll ;extension=php_gmp.dll ;extension=php_ifx.dll +;extension=php_intl.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll @@ -581,12 +583,14 @@ ;extension=php_pdo_pgsql.dll ;extension=php_pdo_sqlite.dll ;extension=php_pgsql.dll +;extension=php_phar.dll ;extension=php_pspell.dll ;extension=php_shmop.dll ;extension=php_snmp.dll ;extension=php_soap.dll ;extension=php_sockets.dll ;extension=php_sqlite.dll +;extension=php_sqlite3.dll ;extension=php_sybase_ct.dll ;extension=php_tidy.dll ;extension=php_xmlrpc.dll @@ -616,9 +620,15 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 +[intl] +;intl.default_locale = + [sqlite] ;sqlite.assoc_case = 0 +[sqlite3] +;sqlite3.extension_dir = + [xmlrpc] ;xmlrpc_error_number = 0 ;xmlrpc_errors = 0 @@ -633,6 +643,11 @@ ;stack size limit imposed by the Operating System). ;pcre.recursion_limit=10 +[Phar] +;phar.readonly = On +;phar.require_hash = On +;phar.cache_list = + [Syslog] ; Whether or not to define the various syslog variables (e.g. $LOG_PID, ; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter callback_filter.c /ext/interbase ibase_events.c php_ibase_udf.c /ext/ldap ldap.c /ext/mysqli mysqli_api.c /ext/pcntl pcntl.c /ext/pcre php_pcre.c /ext/pdo pdo_
felipe Sat Aug 2 04:40:46 2008 UTC
Modified files:
/ZendEngine2zend_API.c zend_API.h zend_builtin_functions.c
/php-src/ext/filter callback_filter.c
/php-src/ext/interbase ibase_events.c php_ibase_udf.c
/php-src/ext/ldap ldap.c
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/pcntl pcntl.c
/php-src/ext/pcre php_pcre.c
/php-src/ext/pdopdo_stmt.c
/php-src/ext/pdo_sqlite sqlite_driver.c
/php-src/ext/readline readline.c
/php-src/ext/sessionsession.c
/php-src/ext/splspl_iterators.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite3sqlite3.c
/php-src/ext/standard array.c basic_functions.c type.c
/php-src/ext/sybase_ct php_sybase_ct.c
/php-src/ext/unicodeproperty.c unicode.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
- Added parameter TSRMLS_DC in zend_is_callable()
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.481r2=1.482diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.481 ZendEngine2/zend_API.c:1.482
--- ZendEngine2/zend_API.c:1.481Sat Aug 2 02:49:46 2008
+++ ZendEngine2/zend_API.c Sat Aug 2 04:40:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.481 2008/08/02 02:49:46 felipe Exp $ */
+/* $Id: zend_API.c,v 1.482 2008/08/02 04:40:43 felipe Exp $ */
#include zend.h
#include zend_execute.h
@@ -3272,10 +3272,8 @@
}
/* }}} */
-ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name) /* {{{ */
+ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name TSRMLS_DC) /* {{{ */
{
- TSRMLS_FETCH();
-
return zend_is_callable_ex(callable, NULL, check_flags, callable_name,
NULL, NULL TSRMLS_CC);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.305r2=1.306diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.305 ZendEngine2/zend_API.h:1.306
--- ZendEngine2/zend_API.h:1.305Tue Jul 29 08:47:21 2008
+++ ZendEngine2/zend_API.h Sat Aug 2 04:40:43 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.h,v 1.305 2008/07/29 08:47:21 tony2001 Exp $ */
+/* $Id: zend_API.h,v 1.306 2008/08/02 04:40:43 felipe Exp $ */
#ifndef ZEND_API_H
#define ZEND_API_H
@@ -285,7 +285,7 @@
#define IS_CALLABLE_STRICT (IS_CALLABLE_CHECK_IS_STATIC)
ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint
check_flags, zval *callable_name, zend_fcall_info_cache *fcc, char **error
TSRMLS_DC);
-ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name);
+ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, zval
*callable_name TSRMLS_DC);
ZEND_API zend_bool zend_make_callable(zval *callable, zval *callable_name
TSRMLS_DC);
ZEND_API const char *zend_get_module_version(const char *module_name);
ZEND_API int zend_get_module_started(char *module_name);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.380r2=1.381diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.380
ZendEngine2/zend_builtin_functions.c:1.381
--- ZendEngine2/zend_builtin_functions.c:1.380 Thu Jul 24 20:44:10 2008
+++ ZendEngine2/zend_builtin_functions.cSat Aug 2 04:40:43 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_builtin_functions.c,v 1.380 2008/07/24 20:44:10 moriyoshi Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.381 2008/08/02 04:40:43 felipe Exp $ */
#include zend.h
#include zend_API.h
@@ -1506,7 +1506,7 @@
return;
}
- if (!zend_is_callable(error_handler, 0, error_handler_name)) {
+ if (!zend_is_callable(error_handler, 0, error_handler_name TSRMLS_CC))
{
zend_error(E_WARNING, %v() expects the argument (%R) to be a
valid callback,
get_active_function_name(TSRMLS_C),
Z_TYPE(error_handler_name), Z_UNIVAL(error_handler_name));
zval_dtor(error_handler_name);
@@ -1576,7 +1576,7 @@
}
if (Z_TYPE_P(exception_handler) != IS_NULL) { /* NULL == unset */
- if (!zend_is_callable(exception_handler, 0,
exception_handler_name)) {
+ if (!zend_is_callable(exception_handler, 0,
exception_handler_name TSRMLS_CC)) {
zend_error(E_WARNING, %v() expects the argument (%R)
to be a valid callback,
get_active_function_name(TSRMLS_C),
Z_TYPE(exception_handler_name), Z_UNIVAL(exception_handler_name));
zval_dtor(exception_handler_name);
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/filter callback_filter.c /ext/interbase ibase_events.c php_ibase_udf.c /ext/ldap ldap.c /ext/mysqli mysqli_api.c /ext/pcntl pcntl.c /ext/pcre php_pcre.c /ext
felipe Sat Aug 2 04:46:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2zend_API.c zend_API.h zend_builtin_functions.c
/php-src/ext/filter callback_filter.c
/php-src/ext/interbase ibase_events.c php_ibase_udf.c
/php-src/ext/ldap ldap.c
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/pcntl pcntl.c
/php-src/ext/pcre php_pcre.c
/php-src/ext/pdopdo_stmt.c
/php-src/ext/pdo_sqlite sqlite_driver.c
/php-src/ext/readline readline.c
/php-src/ext/sessionsession.c
/php-src/ext/splspl_iterators.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/sqlite3sqlite3.c
/php-src/ext/standard array.c basic_functions.c type.c
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-src/main output.c
Log:
- MFH: Added parameter TSRMLS_DC in zend_is_callable()
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.45r2=1.296.2.27.2.34.2.46diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.45
ZendEngine2/zend_API.c:1.296.2.27.2.34.2.46
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.45 Sat Aug 2 02:50:18 2008
+++ ZendEngine2/zend_API.c Sat Aug 2 04:46:05 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.45 2008/08/02 02:50:18 felipe Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.46 2008/08/02 04:46:05 felipe Exp $ */
#include zend.h
#include zend_execute.h
@@ -2746,10 +2746,8 @@
}
/* }}} */
-ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char
**callable_name) /* {{{ */
+ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char
**callable_name TSRMLS_DC) /* {{{ */
{
- TSRMLS_FETCH();
-
return zend_is_callable_ex(callable, NULL, check_flags, callable_name,
NULL, NULL, NULL TSRMLS_CC);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.h?r1=1.207.2.8.2.8.2.15r2=1.207.2.8.2.8.2.16diff_format=u
Index: ZendEngine2/zend_API.h
diff -u ZendEngine2/zend_API.h:1.207.2.8.2.8.2.15
ZendEngine2/zend_API.h:1.207.2.8.2.8.2.16
--- ZendEngine2/zend_API.h:1.207.2.8.2.8.2.15 Sat Jul 26 13:14:00 2008
+++ ZendEngine2/zend_API.h Sat Aug 2 04:46:05 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.h,v 1.207.2.8.2.8.2.15 2008/07/26 13:14:00 dmitry Exp $ */
+/* $Id: zend_API.h,v 1.207.2.8.2.8.2.16 2008/08/02 04:46:05 felipe Exp $ */
#ifndef ZEND_API_H
#define ZEND_API_H
@@ -278,7 +278,7 @@
#define IS_CALLABLE_STRICT (IS_CALLABLE_CHECK_IS_STATIC)
ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint
check_flags, char **callable_name, int *callable_name_len,
zend_fcall_info_cache *fcc, char **error TSRMLS_DC);
-ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char
**callable_name);
+ZEND_API zend_bool zend_is_callable(zval *callable, uint check_flags, char
**callable_name TSRMLS_DC);
ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name
TSRMLS_DC);
ZEND_API const char *zend_get_module_version(const char *module_name);
ZEND_API int zend_get_module_started(char *module_name);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.26r2=1.277.2.12.2.25.2.27diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.26
ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.27
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.26 Thu Jul 24
20:44:15 2008
+++ ZendEngine2/zend_builtin_functions.cSat Aug 2 04:46:05 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.26 2008/07/24 20:44:15
moriyoshi Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.27 2008/08/02 04:46:05
felipe Exp $ */
#include zend.h
#include zend_API.h
@@ -1506,7 +1506,7 @@
return;
}
- if (!zend_is_callable(error_handler, 0, error_handler_name)) {
+ if (!zend_is_callable(error_handler, 0, error_handler_name TSRMLS_CC))
{
zend_error(E_WARNING, %s() expects the argument (%s) to be a
valid callback,
get_active_function_name(TSRMLS_C),
error_handler_name?error_handler_name:unknown);
efree(error_handler_name);
@@ -1578,7 +1578,7 @@
}
if (Z_TYPE_P(exception_handler) != IS_NULL) { /* NULL == unset */
- if (!zend_is_callable(exception_handler, 0,
exception_handler_name)) {
+ if (!zend_is_callable(exception_handler, 0,
exception_handler_name TSRMLS_CC)) {
zend_error(E_WARNING, %s() expects the argument (%s)
to be a valid
