[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Nov 15 01:31:29 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2868r2=1.2869diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2868 php-src/ChangeLog:1.2869 --- php-src/ChangeLog:1.2868Wed Nov 14 01:31:25 2007 +++ php-src/ChangeLog Thu Nov 15 01:31:28 2007 @@ -1,3 +1,220 @@ +2007-11-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/dir.c: + + MFB: Don't show file names being examined + +* (PHP_5_3) + ext/standard/dir.c: + Don't show file names being examined + +2007-11-14 Lars Westermann [EMAIL PROTECTED] + +* (PHP_5_3) + ext/pdo_firebird/firebird_statement.c: + + +2007-11-14 Antony Dovgal [EMAIL PROTECTED] + +* EXTENSIONS: + update pdo_firebird status + +2007-11-14 Lars Westermann [EMAIL PROTECTED] + +* (PHP_5_3) + ext/pdo_firebird/firebird_statement.c: + - Clearing cursor-name when closing it. + +* (PHP_5_3) + ext/pdo_firebird/firebird_statement.c + ext/pdo_firebird/php_pdo_firebird_int.h: + - Fixed bug #43271 (pdo_firebird: closeCursor not implemented) + +2007-11-14 Elizabeth Marie Smith [EMAIL PROTECTED] + +* win32/build/confutils.js + win32/build/confutils.js: + MFB + +* (PHP_5_3) + win32/build/confutils.js: + Allow passing additional configuration parameters to config.nice.bat + +2007-11-14 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/array/uasort_basic1.phpt + ext/standard/tests/array/uasort_basic1.phpt + ext/standard/tests/array/uasort_basic2.phpt + ext/standard/tests/array/uasort_basic2.phpt + ext/standard/tests/array/uasort_error.phpt + ext/standard/tests/array/uasort_error.phpt + ext/standard/tests/array/uasort_object1.phpt + ext/standard/tests/array/uasort_object1.phpt + ext/standard/tests/array/uasort_object2.phpt + ext/standard/tests/array/uasort_object2.phpt + ext/standard/tests/array/uasort_variation1.phpt + ext/standard/tests/array/uasort_variation1.phpt + ext/standard/tests/array/uasort_variation10.phpt + ext/standard/tests/array/uasort_variation10.phpt + ext/standard/tests/array/uasort_variation11.phpt + ext/standard/tests/array/uasort_variation11.phpt + ext/standard/tests/array/uasort_variation2.phpt + ext/standard/tests/array/uasort_variation2.phpt + ext/standard/tests/array/uasort_variation3.phpt + ext/standard/tests/array/uasort_variation3.phpt + ext/standard/tests/array/uasort_variation4.phpt + ext/standard/tests/array/uasort_variation4.phpt + ext/standard/tests/array/uasort_variation5.phpt + ext/standard/tests/array/uasort_variation5.phpt + ext/standard/tests/array/uasort_variation6.phpt + ext/standard/tests/array/uasort_variation6.phpt + ext/standard/tests/array/uasort_variation7.phpt + ext/standard/tests/array/uasort_variation7.phpt + ext/standard/tests/array/uasort_variation8.phpt + ext/standard/tests/array/uasort_variation8.phpt + ext/standard/tests/array/uasort_variation9.phpt + ext/standard/tests/array/uasort_variation9.phpt: + New testcases for uasort() function + +* ext/standard/tests/array/uasort_basic1.phpt + ext/standard/tests/array/uasort_basic1.phpt + ext/standard/tests/array/uasort_basic1.phpt + ext/standard/tests/array/uasort_basic2.phpt + ext/standard/tests/array/uasort_basic2.phpt + ext/standard/tests/array/uasort_basic2.phpt + ext/standard/tests/array/uasort_error.phpt + ext/standard/tests/array/uasort_error.phpt + ext/standard/tests/array/uasort_error.phpt + ext/standard/tests/array/uasort_object1.phpt + ext/standard/tests/array/uasort_object1.phpt + ext/standard/tests/array/uasort_object1.phpt + ext/standard/tests/array/uasort_object2.phpt + ext/standard/tests/array/uasort_object2.phpt + ext/standard/tests/array/uasort_object2.phpt + ext/standard/tests/array/uasort_variation1.phpt + ext/standard/tests/array/uasort_variation1.phpt + ext/standard/tests/array/uasort_variation1.phpt + ext/standard/tests/array/uasort_variation10.phpt + ext/standard/tests/array/uasort_variation10.phpt + ext/standard/tests/array/uasort_variation10.phpt + ext/standard/tests/array/uasort_variation11.phpt + ext/standard/tests/array/uasort_variation11.phpt + ext/standard/tests/array/uasort_variation11.phpt + ext/standard/tests/array/uasort_variation2.phpt + ext/standard/tests/array/uasort_variation2.phpt + ext/standard/tests/array/uasort_variation2.phpt + ext/standard/tests/array/uasort_variation3.phpt + ext/standard/tests/array/uasort_variation3.phpt + ext/standard/tests/array/uasort_variation3.phpt + ext/standard/tests/array/uasort_variation4.phpt +
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file bug43216.phpt
bjori Wed Nov 14 13:07:07 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filebug43216.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43216.phpt?r1=1.3.2.2r2=1.3.2.3diff_format=u Index: php-src/ext/standard/tests/file/bug43216.phpt diff -u php-src/ext/standard/tests/file/bug43216.phpt:1.3.2.2 php-src/ext/standard/tests/file/bug43216.phpt:1.3.2.3 --- php-src/ext/standard/tests/file/bug43216.phpt:1.3.2.2 Fri Nov 9 09:37:42 2007 +++ php-src/ext/standard/tests/file/bug43216.phpt Wed Nov 14 13:07:07 2007 @@ -1,7 +1,7 @@ --TEST-- Bug #43216 (stream_is_local() returns false on file://) --FILE-- -? +?php var_dump(stream_is_local(file://)); ? --EXPECT-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array
Hi Antony, Could you pls send me the diff files for ksort and krsort failure that you mentioned ? With Regards, Raghubansh Antony Dovgal [EMAIL PROTECTED] 13/11/07 04:49 AM To Raghubansh Kumar [EMAIL PROTECTED] cc php-cvs@lists.php.net, SoftVirus [EMAIL PROTECTED], Raghubansh Kumar/India/[EMAIL PROTECTED] Subject Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array These tests fail on Linux 64bit: ext/standard/tests/array/krsort_variation3.phpt ext/standard/tests/array/ksort_variation3.phpt ..as well as already mentioned.. ext/standard/tests/strings/strcspn_variation3.phpt ext/standard/tests/strings/strspn_variation3.phpt ext/standard/tests/strings/strspn_variation4.phpt -- Wbr, Antony Dovgal
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array
On 14.11.2007 16:40, Raghubansh Kumar wrote:
Hi Antony, Could you pls send me the diff files for ksort and krsort
failure that you mentioned ?
Sure, see below.
# cat ext/standard/tests/array/krsort_variation3.diff
206+ array(5) {
207+ [2147483648]=
208+ int(2)
206- array(4) {
218- array(4) {
220+ array(5) {
221+ [2147483648]=
222+ int(2)
230- array(4) {
234+ array(5) {
235+ [2147483648]=
236+ int(2)
# cat ext/standard/tests/array/ksort_variation3.diff
206+ array(5) {
206- array(4) {
215+ [2147483648]=
216+ int(2)
218- array(4) {
220+ array(5) {
229+ [2147483648]=
230+ int(2)
230- array(4) {
234+ array(5) {
243+ [2147483648]=
244+ int(2)
--
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/spl/tests array_004.phpt array_008.phpt
janiWed Nov 14 14:05:43 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl/tests array_004.phpt array_008.phpt Log: - Fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_004.phpt?r1=1.4.8.1r2=1.4.8.2diff_format=u Index: php-src/ext/spl/tests/array_004.phpt diff -u php-src/ext/spl/tests/array_004.phpt:1.4.8.1 php-src/ext/spl/tests/array_004.phpt:1.4.8.2 --- php-src/ext/spl/tests/array_004.phpt:1.4.8.1Fri Nov 2 19:41:10 2007 +++ php-src/ext/spl/tests/array_004.phptWed Nov 14 14:05:42 2007 @@ -3,7 +3,7 @@ --SKIPIF-- ?php if (!extension_loaded(spl)) print skip; ? --INI-- -error_reporting=2047 +allow_call_time_pass_reference=1 --FILE-- ?php http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_008.phpt?r1=1.1.8.1r2=1.1.8.2diff_format=u Index: php-src/ext/spl/tests/array_008.phpt diff -u php-src/ext/spl/tests/array_008.phpt:1.1.8.1 php-src/ext/spl/tests/array_008.phpt:1.1.8.2 --- php-src/ext/spl/tests/array_008.phpt:1.1.8.1Fri Nov 2 19:41:10 2007 +++ php-src/ext/spl/tests/array_008.phptWed Nov 14 14:05:42 2007 @@ -3,7 +3,7 @@ --SKIPIF-- ?php if (!extension_loaded(spl)) print skip; ? --INI-- -error_reporting=2047 +allow_call_time_pass_reference=1 --FILE-- ?php -- 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/standard/tests/array bug33940.phpt
janiWed Nov 14 14:08:51 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array bug33940.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug33940.phpt?r1=1.1.2.2.2.1.2.1r2=1.1.2.2.2.1.2.2diff_format=u Index: php-src/ext/standard/tests/array/bug33940.phpt diff -u php-src/ext/standard/tests/array/bug33940.phpt:1.1.2.2.2.1.2.1 php-src/ext/standard/tests/array/bug33940.phpt:1.1.2.2.2.1.2.2 --- php-src/ext/standard/tests/array/bug33940.phpt:1.1.2.2.2.1.2.1 Fri Nov 2 19:41:11 2007 +++ php-src/ext/standard/tests/array/bug33940.phpt Wed Nov 14 14:08:51 2007 @@ -1,6 +1,7 @@ --TEST-- Bug #33940 (array_map() fails to pass by reference when called recursively) --INI-- +allow_call_time_pass_reference=1 error_reporting=4095 --FILE-- ?php -- 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/standard basic_functions.c /ext/standard/tests/general_functions bug43293_1.phpt bug43293_2.phpt bug43293_3.phpt
bjori Wed Nov 14 14:42:26 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions bug43293_1.phpt
bug43293_2.phpt
bug43293_3.phpt
Modified files:
/php-src/ext/standard basic_functions.c
Log:
Fixed bug#43293 (Multiple segfaults in getopt())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.10r2=1.725.2.31.2.64.2.11diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.10
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.11
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.10 Tue Nov 6
12:12:58 2007
+++ php-src/ext/standard/basic_functions.c Wed Nov 14 14:42:25 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.10 2007/11/06 12:12:58 helly Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.11 2007/11/14 14:42:25 bjori Exp
$ */
#include php.h
#include php_streams.h
@@ -4552,11 +4552,11 @@
/* Get argv from the global symbol table. We calculate argc ourselves
* in order to be on the safe side, even though it is also available
* from the symbol table. */
- if (zend_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]),
argv, sizeof(argv), (void **) args) != FAILURE ||
- zend_hash_find(EG(symbol_table), argv, sizeof(argv), (void
**) args) != FAILURE
+ if ((zend_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]),
argv, sizeof(argv), (void **) args) != FAILURE ||
+ zend_hash_find(EG(symbol_table), argv, sizeof(argv), (void
**) args) != FAILURE) Z_TYPE_PP(args) == IS_ARRAY
) {
int pos = 0;
- zval **arg;
+ zval **entry;
argc = zend_hash_num_elements(Z_ARRVAL_PP(args));
@@ -4568,8 +4568,22 @@
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(args));
/* Iterate over the hash to construct the argv array. */
- while (zend_hash_get_current_data(Z_ARRVAL_PP(args), (void
**)arg) == SUCCESS) {
- argv[pos++] = estrdup(Z_STRVAL_PP(arg));
+ while (zend_hash_get_current_data(Z_ARRVAL_PP(args), (void
**)entry) == SUCCESS) {
+ zval arg, *arg_ptr = *entry;
+
+ if (Z_TYPE_PP(entry) != IS_STRING) {
+ arg = **entry;
+ zval_copy_ctor(arg);
+ convert_to_string(arg);
+ arg_ptr = arg;
+ }
+
+ argv[pos++] = estrdup(Z_STRVAL_P(arg_ptr));
+
+ if (arg_ptr != *entry) {
+ zval_dtor(arg);
+ }
+
zend_hash_move_forward(Z_ARRVAL_PP(args));
}
@@ -4585,7 +4599,7 @@
if (p_longopts) {
int count;
- zval **arg;
+ zval **entry;
count = zend_hash_num_elements(Z_ARRVAL_P(p_longopts));
@@ -4605,9 +4619,18 @@
zend_hash_internal_pointer_reset(Z_ARRVAL_P(p_longopts));
/* Iterate over the hash to construct the argv array. */
- while (zend_hash_get_current_data(Z_ARRVAL_P(p_longopts), (void
**)arg) == SUCCESS) {
+ while (zend_hash_get_current_data(Z_ARRVAL_P(p_longopts), (void
**)entry) == SUCCESS) {
+ zval arg, *arg_ptr = *entry;
+
+ if (Z_TYPE_PP(entry) != IS_STRING) {
+ arg = **entry;
+ zval_copy_ctor(arg);
+ convert_to_string(arg);
+ arg_ptr = arg;
+ }
+
opts-need_param = 0;
- opts-opt_name = estrdup(Z_STRVAL_PP(arg));
+ opts-opt_name = estrdup(Z_STRVAL_P(arg_ptr));
len = strlen(opts-opt_name);
if ((len 0) (opts-opt_name[len - 1] == ':')) {
opts-need_param++;
@@ -4619,6 +4642,11 @@
}
opts-opt_char = 0;
opts++;
+
+ if (arg_ptr != *entry) {
+ zval_dtor(arg);
+ }
+
zend_hash_move_forward(Z_ARRVAL_P(p_longopts));
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug43293_1.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/bug43293_1.phpt
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c /ext/standard/tests/general_functions bug43293_1.phpt bug43293_2.phpt bug43293_3.phpt
bjori Wed Nov 14 14:55:44 2007 UTC
Modified files:
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/general_functions bug43293_1.phpt
bug43293_2.phpt
bug43293_3.phpt
Log:
MFB5.3: Fixed bug#43293 (Multiple segfaults in getopt())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.881r2=1.882diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.881
php-src/ext/standard/basic_functions.c:1.882
--- php-src/ext/standard/basic_functions.c:1.881Fri Nov 2 10:57:56 2007
+++ php-src/ext/standard/basic_functions.c Wed Nov 14 14:55:44 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.881 2007/11/02 10:57:56 jani Exp $ */
+/* $Id: basic_functions.c,v 1.882 2007/11/14 14:55:44 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -4516,11 +4516,11 @@
/* Get argv from the global symbol table. We calculate argc ourselves
* in order to be on the safe side, even though it is also available
* from the symbol table. */
- if (zend_ascii_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]),
argv, sizeof(argv), (void **) args) != FAILURE ||
- zend_ascii_hash_find(EG(symbol_table), argv, sizeof(argv),
(void **) args) != FAILURE
+ if ((zend_ascii_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]),
argv, sizeof(argv), (void **) args) != FAILURE ||
+ zend_ascii_hash_find(EG(symbol_table), argv, sizeof(argv),
(void **) args) != FAILURE) Z_TYPE_PP(args) == IS_ARRAY
) {
int pos = 0;
- zval **arg;
+ zval **entry;
argc = zend_hash_num_elements(Z_ARRVAL_PP(args));
@@ -4532,8 +4532,22 @@
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(args));
/* Iterate over the hash to construct the argv array. */
- while (zend_hash_get_current_data(Z_ARRVAL_PP(args), (void
**)arg) == SUCCESS) {
- argv[pos++] = estrdup(Z_STRVAL_PP(arg));
+ while (zend_hash_get_current_data(Z_ARRVAL_PP(args), (void
**)entry) == SUCCESS) {
+ zval arg, *arg_ptr = *entry;
+
+ if (Z_TYPE_PP(entry) != IS_STRING) {
+ arg = **entry;
+ zval_copy_ctor(arg);
+ convert_to_string(arg);
+ arg_ptr = arg;
+ }
+
+ argv[pos++] = estrdup(Z_STRVAL_P(arg_ptr));
+
+ if (arg_ptr != *entry) {
+ zval_dtor(arg);
+ }
+
zend_hash_move_forward(Z_ARRVAL_PP(args));
}
@@ -4549,7 +4563,7 @@
if (p_longopts) {
int count;
- zval **arg;
+ zval **entry;
count = zend_hash_num_elements(Z_ARRVAL_P(p_longopts));
@@ -4569,9 +4583,18 @@
zend_hash_internal_pointer_reset(Z_ARRVAL_P(p_longopts));
/* Iterate over the hash to construct the argv array. */
- while (zend_hash_get_current_data(Z_ARRVAL_P(p_longopts), (void
**)arg) == SUCCESS) {
+ while (zend_hash_get_current_data(Z_ARRVAL_P(p_longopts), (void
**)entry) == SUCCESS) {
+ zval arg, *arg_ptr = *entry;
+
+ if (Z_TYPE_PP(entry) != IS_STRING) {
+ arg = **entry;
+ zval_copy_ctor(arg);
+ convert_to_string(arg);
+ arg_ptr = arg;
+ }
+
opts-need_param = 0;
- opts-opt_name = estrdup(Z_STRVAL_PP(arg));
+ opts-opt_name = estrdup(Z_STRVAL_P(arg_ptr));
len = strlen(opts-opt_name);
if ((len 0) (opts-opt_name[len - 1] == ':')) {
opts-need_param++;
@@ -4583,6 +4606,11 @@
}
opts-opt_char = 0;
opts++;
+
+ if (arg_ptr != *entry) {
+ zval_dtor(arg);
+ }
+
zend_hash_move_forward(Z_ARRVAL_P(p_longopts));
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug43293_1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/bug43293_1.phpt
diff -u /dev/null
php-src/ext/standard/tests/general_functions/bug43293_1.phpt:1.2
--- /dev/null Wed Nov 14
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions getopt.phpt
bjori Wed Nov 14 15:22:45 2007 UTC
Modified files:
/php-src/ext/standard/tests/general_functions getopt.phpt
Log:
MFB; Fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getopt.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/general_functions/getopt.phpt
diff -u php-src/ext/standard/tests/general_functions/getopt.phpt:1.4
php-src/ext/standard/tests/general_functions/getopt.phpt:1.5
--- php-src/ext/standard/tests/general_functions/getopt.phpt:1.4Mon Aug
15 14:37:55 2005
+++ php-src/ext/standard/tests/general_functions/getopt.phptWed Nov 14
15:22:45 2007
@@ -5,12 +5,6 @@
--INI--
register_argc_argv=On
variables_order=GPS
---SKIPIF--
-?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip getopt() is currently not available on Windows');
- }
-?
--FILE--
?php
var_dump(getopt(d:m:j:vht));
--
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/standard/tests/general_functions getopt.phpt
bjori Wed Nov 14 15:22:11 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions getopt.phpt
Log:
Fix test (getopt() works on windows now)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getopt.phpt?r1=1.3r2=1.3.8.1diff_format=u
Index: php-src/ext/standard/tests/general_functions/getopt.phpt
diff -u php-src/ext/standard/tests/general_functions/getopt.phpt:1.3
php-src/ext/standard/tests/general_functions/getopt.phpt:1.3.8.1
--- php-src/ext/standard/tests/general_functions/getopt.phpt:1.3Mon Jun
30 18:22:52 2003
+++ php-src/ext/standard/tests/general_functions/getopt.phptWed Nov 14
15:22:11 2007
@@ -5,12 +5,6 @@
--INI--
register_argc_argv=On
variables_order=GPS
---SKIPIF--
-?php
- if (substr(PHP_OS, 0, 3) == 'WIN') {
- die('skip getopt() is currently not available on Windows');
- }
-?
--FILE--
?php
var_dump(getopt(d:m:j:vht));
--
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/standard basic_functions.c /ext/standard/tests/general_functions bug43293_1.phpt bug43293_2.phpt bug43293_3.phpt
bjori Wed Nov 14 15:19:30 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions bug43293_1.phpt
bug43293_2.phpt
bug43293_3.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c
Log:
MFB5.3: Fixed bug#43293 (Multiple segfaults in getopt())
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1010r2=1.2027.2.547.2.1011diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1010 php-src/NEWS:1.2027.2.547.2.1011
--- php-src/NEWS:1.2027.2.547.2.1010Tue Nov 13 20:08:04 2007
+++ php-src/NEWSWed Nov 14 15:19:29 2007
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2008, PHP 5.2.6
+- Fixed bug #43293 (Multiple segfaults in getopt()). (Hannes)
- Fixed bug #43279 (pg_send_query_params() converts all elements in 'params'
to strings). (Ilia)
- Fixed bug #43248 (backward compatibility break in realpath()). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.66r2=1.725.2.31.2.67diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.66
php-src/ext/standard/basic_functions.c:1.725.2.31.2.67
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.66 Mon Oct 22
07:37:20 2007
+++ php-src/ext/standard/basic_functions.c Wed Nov 14 15:19:29 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.66 2007/10/22 07:37:20 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.67 2007/11/14 15:19:29 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -4568,10 +4568,11 @@
* in order to be on the safe side, even though it is also available
* from the symbol table.
*/
- if (zend_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]),
argv, sizeof(argv), (void **) args) != FAILURE ||
- zend_hash_find(EG(symbol_table), argv, sizeof(argv), (void
**) args) != FAILURE) {
+ if ((zend_hash_find(HASH_OF(PG(http_globals)[TRACK_VARS_SERVER]),
argv, sizeof(argv), (void **) args) != FAILURE ||
+ zend_hash_find(EG(symbol_table), argv, sizeof(argv), (void
**) args) != FAILURE) Z_TYPE_PP(args) == IS_ARRAY
+ ) {
int pos = 0;
- zval **arg;
+ zval **entry;
argc = zend_hash_num_elements(Z_ARRVAL_PP(args));
@@ -4586,8 +4587,22 @@
/* Iterate over the hash to construct the argv array. */
while (zend_hash_get_current_data(Z_ARRVAL_PP(args),
-
(void **)arg) == SUCCESS) {
- argv[pos++] = estrdup(Z_STRVAL_PP(arg));
+
(void **)entry) == SUCCESS) {
+ zval arg, *arg_ptr = *entry;
+
+ if (Z_TYPE_PP(entry) != IS_STRING) {
+ arg = **entry;
+ zval_copy_ctor(arg);
+ convert_to_string(arg);
+ arg_ptr = arg;
+ }
+
+ argv[pos++] = estrdup(Z_STRVAL_P(arg_ptr));
+
+ if (arg_ptr != *entry) {
+ zval_dtor(arg);
+ }
+
zend_hash_move_forward(Z_ARRVAL_PP(args));
}
@@ -4605,7 +4620,7 @@
#ifdef HARTMUT_0
int len, c = zend_hash_num_elements(Z_ARRVAL_P(p_longopts));
struct option *p;
- zval **arg;
+ zval **entry;
char *name;
longopts = (struct option *)ecalloc(c+1, sizeof(struct option));
@@ -4618,10 +4633,19 @@
/* Iterate over the hash to construct the argv array. */
while (zend_hash_get_current_data(Z_ARRVAL_P(p_longopts),
-
(void **)arg) == SUCCESS) {
+
(void **)entry) == SUCCESS) {
+ zval arg, *arg_ptr = *entry;
+
+ if (Z_TYPE_PP(entry) != IS_STRING) {
+ arg = **entry;
+ zval_copy_ctor(arg);
+ convert_to_string(arg);
+ arg_ptr = arg;
+ }
+
p-has_arg = 0;
-
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings strcspn_variation3.phpt strspn_variation3.phpt strspn_variation4.phpt
kraghubaWed Nov 14 16:30:10 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings strcspn_variation3.phpt
strspn_variation3.phpt
strspn_variation4.phpt
Log:
fix test for linux64 - choosing smaller float values
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strcspn_variation3.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/strings/strcspn_variation3.phpt
diff -u php-src/ext/standard/tests/strings/strcspn_variation3.phpt:1.1.2.2
php-src/ext/standard/tests/strings/strcspn_variation3.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strcspn_variation3.phpt:1.1.2.2 Fri Nov
9 07:09:52 2007
+++ php-src/ext/standard/tests/strings/strcspn_variation3.phpt Wed Nov 14
16:30:09 2007
@@ -1,243 +1,243 @@
---TEST--
-Test strcspn() function : usage variations - unexpected values of start
argument
---FILE--
-?php
-/* Prototype : proto int strcspn(string str, string mask [,int start [,int
len]])
- * Description: Finds length of initial segment consisting entirely of
characters not found in mask.
-If start or/and length is provided works like
strcspn(substr($s,$start,$len),$bad_chars)
- * Source code: ext/standard/string.c
- * Alias to functions: none
-*/
-
-error_reporting(E_ALL ~E_NOTICE);
-
-/*
-* Testing strcspn() : with unexpected values of start argument
-*/
-
-echo *** Testing strcspn() : with unexpected values of start argument ***\n;
-
-// initialing required variables
-$str = 'string_val';
-$mask = 'soibtFTf1234567890';
-$len = 10;
-
-//get an unset variable
-$unset_var = 10;
-unset ($unset_var);
-
-// declaring class
-class sample {
- public function __toString() {
-return object;
- }
-}
-
-// creating a file resource
-$file_handle = fopen(__FILE__, 'r');
-
-
-//array of values to iterate over
-$values = array(
-
- // float data
- 10.5,
- -10.5,
- 10.1234567e10,
- 10.7654321E-10,
- .5,
-
- // array data
- array(),
- array(0),
- array(1),
- array(1, 2),
- array('color' = 'red', 'item' = 'pen'),
-
- // null data
- NULL,
- null,
-
- // boolean data
- true,
- false,
- TRUE,
- FALSE,
-
- // empty data
- ,
- '',
-
- // string data
- string,
- 'string',
-
- // object data
- new sample(),
-
- // undefined data
- $undefined_var,
-
- // unset data
- $unset_var,
-
- // resource
- $file_handle
-);
-
-// loop through each element of the array for start
-
-foreach($values as $value) {
- echo \n-- Iteration with start value as \$value\ --\n;
- var_dump( strcspn($str,$mask,$value) ); // with default len value
- var_dump( strcspn($str,$mask,$value,$len) ); // with all args
-};
-
-// closing the resource
-fclose($file_handle);
-
-echo Done
-?
---EXPECTF--
-*** Testing strcspn() : with unexpected values of start argument ***
-
--- Iteration with start value as 10.5 --
-int(0)
-int(0)
-
--- Iteration with start value as -10.5 --
-int(0)
-int(0)
-
--- Iteration with start value as 101234567000 --
-int(0)
-int(0)
-
--- Iteration with start value as 1.07654321E-9 --
-int(0)
-int(0)
-
--- Iteration with start value as 0.5 --
-int(0)
-int(0)
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line 89
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as --
-int(0)
-int(0)
-
--- Iteration with start value as --
-int(0)
-int(0)
-
--- Iteration with start value as 1 --
-int(0)
-int(0)
-
--- Iteration with start value as --
-int(0)
-int(0)
-
--- Iteration with start value as 1 --
-int(0)
-int(0)
-
--- Iteration with start value as --
-int(0)
-int(0)
-
--- Iteration with start value as --
-
-Warning: strcspn() expects parameter 3 to be long, string given in %s on line
%d
-NULL
-
-Warning: strcspn() expects
Re: [PHP-CVS] Re: cvs: php-src /ext/pdo pdo_sql_parser.c pdo_sql_parser.re /ext/pdo/tests bug_43130.phpt
On 01.11.2007, at 00:56, Lorenzo Alberton wrote:
Lukas Kahwe Smith wrote:
I talked to Christopher Jones (of Oracle fame) and Lorenzo (MDB2
maintainer). Its clear that the only named parameter supporting
database I know does not support dash inside named parameters. Its
also dangerous since it means that whitespace typos could have
serious hard to spot issues. I think a safe regexp for bound
parameters would look something like: /^[a-z0-9][a-z0-9_]{0,30}$/
Since I couldn't find any official reference in
the oracle documentation, I did further tests.
I can reproduce the following behaviour on two
different machines (intel P4 and Core2Duo):
- if the named parameter is all digits,
it must be 65536 or I get an ORA-01745 error.
- if the name starts with a digit,
only digits are allowed (ORA-01036)
- the hyphen (-) is forbidden (ORA-01036)
- the name can't start with an underscore (ORA-01036),
but can contain it elsewhere
- the (alpha-numeric) name must be = 30 chars(ORA-00972)
- trivia: some non-standard ASCII chars (àòùéèç#$!)
are considered valid, but not all of them (°§£)
so please someone revert this change ... or better yet implement the
above rules.
regards,
Lukas
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file chgrp.phpt
derick Wed Nov 14 15:51:35 2007 UTC Added files: /php-src/ext/standard/tests/filechgrp.phpt Log: - Add a testcase for chgrp() with a NULL as group name, which crashes ATM. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chgrp.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/chgrp.phpt +++ php-src/ext/standard/tests/file/chgrp.phpt --TEST-- chgrp() with NULL as group name --FILE-- ?php chgrp(sjhgfskhagkfdgskjfhgskfsdgfkdsajf, NULL); echo ALIVE\n; ? --EXPECT-- ALIVE -- 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/standard/tests/file chgrp.phpt
derick Wed Nov 14 15:51:56 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filechgrp.phpt Log: - MFH: Add a testcase for chgrp() with a NULL as group name, which crashes ATM. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chgrp.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/chgrp.phpt +++ php-src/ext/standard/tests/file/chgrp.phpt --TEST-- chgrp() with NULL as group name --FILE-- ?php chgrp(sjhgfskhagkfdgskjfhgskfsdgfkdsajf, NULL); echo ALIVE\n; ? --EXPECT-- ALIVE -- 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/standard/tests/strings strcspn_variation3.phpt strspn_variation3.phpt strspn_variation4.phpt
kraghubaWed Nov 14 16:31:45 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings strcspn_variation3.phpt
strspn_variation3.phpt
strspn_variation4.phpt
Log:
fix test for linux64 - choosing smaller float values
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strcspn_variation3.phpt?r1=1.1.2.1.2.1r2=1.1.2.1.2.2diff_format=u
Index: php-src/ext/standard/tests/strings/strcspn_variation3.phpt
diff -u php-src/ext/standard/tests/strings/strcspn_variation3.phpt:1.1.2.1.2.1
php-src/ext/standard/tests/strings/strcspn_variation3.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/strings/strcspn_variation3.phpt:1.1.2.1.2.1
Fri Nov 9 07:19:00 2007
+++ php-src/ext/standard/tests/strings/strcspn_variation3.phpt Wed Nov 14
16:31:45 2007
@@ -1,243 +1,243 @@
---TEST--
-Test strcspn() function : usage variations - unexpected values of start
argument
---FILE--
-?php
-/* Prototype : proto int strcspn(string str, string mask [,int start [,int
len]])
- * Description: Finds length of initial segment consisting entirely of
characters not found in mask.
-If start or/and length is provided works like
strcspn(substr($s,$start,$len),$bad_chars)
- * Source code: ext/standard/string.c
- * Alias to functions: none
-*/
-
-error_reporting(E_ALL ~E_NOTICE);
-
-/*
-* Testing strcspn() : with unexpected values of start argument
-*/
-
-echo *** Testing strcspn() : with unexpected values of start argument ***\n;
-
-// initialing required variables
-$str = 'string_val';
-$mask = 'soibtFTf1234567890';
-$len = 10;
-
-//get an unset variable
-$unset_var = 10;
-unset ($unset_var);
-
-// declaring class
-class sample {
- public function __toString() {
-return object;
- }
-}
-
-// creating a file resource
-$file_handle = fopen(__FILE__, 'r');
-
-
-//array of values to iterate over
-$values = array(
-
- // float data
- 10.5,
- -10.5,
- 10.1234567e10,
- 10.7654321E-10,
- .5,
-
- // array data
- array(),
- array(0),
- array(1),
- array(1, 2),
- array('color' = 'red', 'item' = 'pen'),
-
- // null data
- NULL,
- null,
-
- // boolean data
- true,
- false,
- TRUE,
- FALSE,
-
- // empty data
- ,
- '',
-
- // string data
- string,
- 'string',
-
- // object data
- new sample(),
-
- // undefined data
- $undefined_var,
-
- // unset data
- $unset_var,
-
- // resource
- $file_handle
-);
-
-// loop through each element of the array for start
-
-foreach($values as $value) {
- echo \n-- Iteration with start value as \$value\ --\n;
- var_dump( strcspn($str,$mask,$value) ); // with default len value
- var_dump( strcspn($str,$mask,$value,$len) ); // with all args
-};
-
-// closing the resource
-fclose($file_handle);
-
-echo Done
-?
---EXPECTF--
-*** Testing strcspn() : with unexpected values of start argument ***
-
--- Iteration with start value as 10.5 --
-int(0)
-int(0)
-
--- Iteration with start value as -10.5 --
-int(0)
-int(0)
-
--- Iteration with start value as 101234567000 --
-int(0)
-int(0)
-
--- Iteration with start value as 1.07654321E-9 --
-int(0)
-int(0)
-
--- Iteration with start value as 0.5 --
-int(0)
-int(0)
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line 89
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as Array --
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
-Warning: strcspn() expects parameter 3 to be long, array given in %s on line %d
-NULL
-
--- Iteration with start value as --
-int(0)
-int(0)
-
--- Iteration with start value as --
-int(0)
-int(0)
-
--- Iteration with start value as 1 --
-int(0)
-int(0)
-
--- Iteration with start value as --
-int(0)
-int(0)
-
--- Iteration with start value as 1 --
-int(0)
-int(0)
-
--- Iteration with start value as --
-int(0)
-int(0)
-
--- Iteration with start value as --
-
-Warning: strcspn() expects parameter 3 to be long, string given in %s on line
%d
-NULL
-
Re: [PHP-CVS] cvs: php-src(PHP_5_3)
Hi Antony, I have committed fix for these failure. Please give a run on the linux-64bit machine and let me know how they go. With Regards, Raghubansh Antony Dovgal [EMAIL PROTECTED] 09/11/07 06:19 PM To Raghubansh Kumar [EMAIL PROTECTED] cc php-cvs@lists.php.net Subject Re: [PHP-CVS] cvs: php-src(PHP_5_3) The tests below do not pass anymore after the update (on Linux 64bit): ext/standard/tests/strings/strcspn_variation3.phpt # cat ext/standard/tests/strings/strcspn_variation3.diff 012+ bool(false) 013+ bool(false) 012- int(0) ext/standard/tests/strings/strspn_variation3.phpt # cat ext/standard/tests/strings/strspn_variation3.diff 012+ bool(false) 013+ bool(false) 012- int(2) 013- int(2) ext/standard/tests/strings/strspn_variation4.phpt # cat ext/standard/tests/strings/strspn_variation4.diff 010+ int(2) 010- int(0) On 09.11.2007 10:19, Raghubansh Kumar wrote: kraghuba Fri Nov 9 07:19:00 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings strspn_variation2.phpt chunk_split_variation1.phpt crc32_variation1.phpt strcspn_variation4.phpt strcspn_variation1.phpt strtok_variation1.phpt strspn_variation1.phpt chunk_split_variation2.phpt strspn_variation4.phpt strcspn_variation2.phpt chunk_split_variation3.phpt strspn_variation3.phpt strcspn_variation3.phpt ucwords_variation1.phpt Log: fix tests: better float values -- Wbr, Antony Dovgal
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array uasort_basic1.phpt uasort_basic2.phpt uasort_error.phpt uasort_object1.phpt uasort_object2.phpt uasort_variation1.phpt uasort_variation10.phpt
kraghubaWed Nov 14 17:17:50 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array uasort_error.phpt uasort_variation1.phpt uasort_variation2.phpt uasort_variation3.phpt uasort_variation4.phpt uasort_variation5.phpt uasort_basic1.phpt uasort_variation6.phpt uasort_variation7.phpt uasort_basic2.phpt uasort_variation8.phpt uasort_variation9.phpt uasort_object1.phpt uasort_variation10.phpt uasort_object2.phpt uasort_variation11.phpt Log: New testcases for uasort() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_error.phpt +++ php-src/ext/standard/tests/array/uasort_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation1.phpt +++ php-src/ext/standard/tests/array/uasort_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation2.phpt +++ php-src/ext/standard/tests/array/uasort_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation3.phpt +++ php-src/ext/standard/tests/array/uasort_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation4.phpt +++ php-src/ext/standard/tests/array/uasort_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation5.phpt +++ php-src/ext/standard/tests/array/uasort_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_basic1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_basic1.phpt +++ php-src/ext/standard/tests/array/uasort_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation6.phpt +++ php-src/ext/standard/tests/array/uasort_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation7.phpt +++ php-src/ext/standard/tests/array/uasort_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_basic2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_basic2.phpt +++ php-src/ext/standard/tests/array/uasort_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation8.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation8.phpt +++ php-src/ext/standard/tests/array/uasort_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation9.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation9.phpt +++ php-src/ext/standard/tests/array/uasort_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_object1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_object1.phpt +++ php-src/ext/standard/tests/array/uasort_object1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation10.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation10.phpt +++ php-src/ext/standard/tests/array/uasort_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_object2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_object2.phpt +++ php-src/ext/standard/tests/array/uasort_object2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation11.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation11.phpt +++ php-src/ext/standard/tests/array/uasort_variation11.phpt -- 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/standard/tests/array uasort_basic1.phpt uasort_basic2.phpt uasort_error.phpt uasort_object1.phpt uasort_object2.phpt uasort_variation1.phpt uasort_variation10.phpt
kraghubaWed Nov 14 17:19:45 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array uasort_error.phpt uasort_variation1.phpt uasort_variation2.phpt uasort_variation3.phpt uasort_variation4.phpt uasort_variation5.phpt uasort_basic1.phpt uasort_variation6.phpt uasort_variation7.phpt uasort_basic2.phpt uasort_variation8.phpt uasort_variation9.phpt uasort_object1.phpt uasort_variation10.phpt uasort_object2.phpt uasort_variation11.phpt Log: New testcases for uasort() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_error.phpt +++ php-src/ext/standard/tests/array/uasort_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation1.phpt +++ php-src/ext/standard/tests/array/uasort_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation2.phpt +++ php-src/ext/standard/tests/array/uasort_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation3.phpt +++ php-src/ext/standard/tests/array/uasort_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation4.phpt +++ php-src/ext/standard/tests/array/uasort_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation5.phpt +++ php-src/ext/standard/tests/array/uasort_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_basic1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_basic1.phpt +++ php-src/ext/standard/tests/array/uasort_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation6.phpt +++ php-src/ext/standard/tests/array/uasort_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation7.phpt +++ php-src/ext/standard/tests/array/uasort_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_basic2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_basic2.phpt +++ php-src/ext/standard/tests/array/uasort_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation8.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation8.phpt +++ php-src/ext/standard/tests/array/uasort_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation9.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation9.phpt +++ php-src/ext/standard/tests/array/uasort_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_object1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_object1.phpt +++ php-src/ext/standard/tests/array/uasort_object1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation10.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation10.phpt +++ php-src/ext/standard/tests/array/uasort_variation10.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_object2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_object2.phpt +++ php-src/ext/standard/tests/array/uasort_object2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/uasort_variation11.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/uasort_variation11.phpt +++ php-src/ext/standard/tests/array/uasort_variation11.phpt -- 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 confutils.js
auroraeosrose Wed Nov 14 19:38:57 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js
Log:
Allow passing additional configuration parameters to config.nice.bat
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8r2=1.60.2.1.2.8.2.1diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.1
--- php-src/win32/build/confutils.js:1.60.2.1.2.8 Thu Jul 26 22:45:59 2007
+++ php-src/win32/build/confutils.jsWed Nov 14 19:38:57 2007
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8 2007/07/26 22:45:59 jani Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.1 2007/11/14 19:38:57 auroraeosrose Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -429,7 +429,7 @@
STDOUT.WriteLine(Saving configure options to config.nice.bat);
var nicefile = FSO.CreateTextFile(config.nice.bat, true);
- nicefile.WriteLine(nice);
+ nicefile.WriteLine(nice + %*);
nicefile.Close();
AC_DEFINE('CONFIGURE_COMMAND', nice);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
auroraeosrose Wed Nov 14 19:44:24 2007 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.69r2=1.70diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.69
php-src/win32/build/confutils.js:1.70
--- php-src/win32/build/confutils.js:1.69 Thu Jul 26 22:45:22 2007
+++ php-src/win32/build/confutils.jsWed Nov 14 19:44:24 2007
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.69 2007/07/26 22:45:22 jani Exp $
+// $Id: confutils.js,v 1.70 2007/11/14 19:44:24 auroraeosrose Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -429,7 +429,7 @@
STDOUT.WriteLine(Saving configure options to config.nice.bat);
var nicefile = FSO.CreateTextFile(config.nice.bat, true);
- nicefile.WriteLine(nice);
+ nicefile.WriteLine(nice + %*);
nicefile.Close();
AC_DEFINE('CONFIGURE_COMMAND', nice);
--
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) /win32/build confutils.js
auroraeosrose Wed Nov 14 19:48:57 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/win32/buildconfutils.js
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8r2=1.60.2.1.2.9diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8
php-src/win32/build/confutils.js:1.60.2.1.2.9
--- php-src/win32/build/confutils.js:1.60.2.1.2.8 Thu Jul 26 22:45:59 2007
+++ php-src/win32/build/confutils.jsWed Nov 14 19:48:57 2007
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8 2007/07/26 22:45:59 jani Exp $
+// $Id: confutils.js,v 1.60.2.1.2.9 2007/11/14 19:48:57 auroraeosrose Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -429,7 +429,7 @@
STDOUT.WriteLine(Saving configure options to config.nice.bat);
var nicefile = FSO.CreateTextFile(config.nice.bat, true);
- nicefile.WriteLine(nice);
+ nicefile.WriteLine(nice + %*);
nicefile.Close();
AC_DEFINE('CONFIGURE_COMMAND', nice);
--
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_firebird firebird_statement.c php_pdo_firebird_int.h
lwe Wed Nov 14 22:09:21 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_firebird firebird_statement.c
php_pdo_firebird_int.h
Log:
- Fixed bug #43271 (pdo_firebird: closeCursor not implemented)
# Actually firebird_stmt_execute() didn't close a previously opened cursor,
but implemented closeCursor anyway.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_statement.c?r1=1.18.2.1.2.5.2.1r2=1.18.2.1.2.5.2.2diff_format=u
Index: php-src/ext/pdo_firebird/firebird_statement.c
diff -u php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.1
php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.2
--- php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.1 Tue Oct
30 16:31:41 2007
+++ php-src/ext/pdo_firebird/firebird_statement.c Wed Nov 14 22:09:21 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: firebird_statement.c,v 1.18.2.1.2.5.2.1 2007/10/30 16:31:41 lwe Exp $
*/
+/* $Id: firebird_statement.c,v 1.18.2.1.2.5.2.2 2007/11/14 22:09:21 lwe Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -92,11 +92,11 @@
pdo_firebird_db_handle *H = S-H;
do {
- /* named cursors should be closed first */
- if (*S-name isc_dsql_free_statement(H-isc_status,
S-stmt, DSQL_close)) {
+ /* named or open cursors should be closed first */
+ if ((*S-name || S-cursor_open)
isc_dsql_free_statement(H-isc_status, S-stmt, DSQL_close)) {
break;
}
-
+ S-cursor_open = 0;
/* assume all params have been bound */
if ((S-statement_type == isc_info_sql_stmt_exec_procedure
@@ -113,6 +113,7 @@
}
*S-name = 0;
+ S-cursor_open = 1;
S-exhausted = 0;
return 1;
@@ -612,6 +613,20 @@
}
/* }}} */
+static int firebird_stmt_cursor_closer(pdo_stmt_t *stmt TSRMLS_DC) /* {{{ */
+{
+ pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt-driver_data;
+
+ /* close the statement handle */
+ if (isc_dsql_free_statement(S-H-isc_status, S-stmt, DSQL_close)) {
+ RECORD_ERROR(stmt);
+ return 0;
+ }
+ return 1;
+}
+/* }}} */
+
+
struct pdo_stmt_methods firebird_stmt_methods = { /* {{{ */
firebird_stmt_dtor,
firebird_stmt_execute,
@@ -620,7 +635,10 @@
firebird_stmt_get_col,
firebird_stmt_param_hook,
firebird_stmt_set_attribute,
- firebird_stmt_get_attribute
+ firebird_stmt_get_attribute,
+ NULL, /* get_column_meta_func */
+ NULL, /* next_rowset_func */
+ firebird_stmt_cursor_closer
};
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/php_pdo_firebird_int.h?r1=1.10.2.1.2.1.2.1r2=1.10.2.1.2.1.2.2diff_format=u
Index: php-src/ext/pdo_firebird/php_pdo_firebird_int.h
diff -u php-src/ext/pdo_firebird/php_pdo_firebird_int.h:1.10.2.1.2.1.2.1
php-src/ext/pdo_firebird/php_pdo_firebird_int.h:1.10.2.1.2.1.2.2
--- php-src/ext/pdo_firebird/php_pdo_firebird_int.h:1.10.2.1.2.1.2.1Tue Oct
30 16:26:25 2007
+++ php-src/ext/pdo_firebird/php_pdo_firebird_int.h Wed Nov 14 22:09:21 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pdo_firebird_int.h,v 1.10.2.1.2.1.2.1 2007/10/30 16:26:25 lwe Exp
$ */
+/* $Id: php_pdo_firebird_int.h,v 1.10.2.1.2.1.2.2 2007/11/14 22:09:21 lwe Exp
$ */
#ifndef PHP_PDO_FIREBIRD_INT_H
#define PHP_PDO_FIREBIRD_INT_H
@@ -102,7 +102,10 @@
/* whether EOF was reached for this statement */
unsigned exhausted:1;
- unsigned _reserved:23;
+ /* successful isc_dsql_execute opens a cursor */
+ unsigned cursor_open:1;
+
+ unsigned _reserved:22;
/* the named params that were converted to ?'s by the driver */
HashTable *named_params;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_firebird firebird_statement.c
lwe Wed Nov 14 22:15:22 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo_firebird firebird_statement.c Log: - Clearing cursor-name when closing it. http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_statement.c?r1=1.18.2.1.2.5.2.2r2=1.18.2.1.2.5.2.3diff_format=u Index: php-src/ext/pdo_firebird/firebird_statement.c diff -u php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.2 php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.3 --- php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.2 Wed Nov 14 22:09:21 2007 +++ php-src/ext/pdo_firebird/firebird_statement.c Wed Nov 14 22:15:21 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: firebird_statement.c,v 1.18.2.1.2.5.2.2 2007/11/14 22:09:21 lwe Exp $ */ +/* $Id: firebird_statement.c,v 1.18.2.1.2.5.2.3 2007/11/14 22:15:21 lwe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -622,6 +622,7 @@ RECORD_ERROR(stmt); return 0; } + *S-name = 0; return 1; } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / EXTENSIONS
tony2001Wed Nov 14 22:36:50 2007 UTC Modified files: /php-srcEXTENSIONS Log: update pdo_firebird status http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.78r2=1.79diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.78 php-src/EXTENSIONS:1.79 --- php-src/EXTENSIONS:1.78 Fri Apr 20 08:18:35 2007 +++ php-src/EXTENSIONS Wed Nov 14 22:36:50 2007 @@ -182,8 +182,8 @@ SINCE: 5.1 --- EXTENSION: pdo_firebird -PRIMARY MAINTAINER: Unknown -MAINTENANCE: Odd fixes +PRIMARY MAINTAINER: Lars Westermann [EMAIL PROTECTED] +MAINTENANCE: Maintained STATUS: Working SINCE: 5.1 --- -- 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) / EXTENSIONS
tony2001Wed Nov 14 22:37:01 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: MFH http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4r2=1.72.2.4.2.4.2.1diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4 php-src/EXTENSIONS:1.72.2.4.2.4.2.1 --- php-src/EXTENSIONS:1.72.2.4.2.4 Fri Apr 20 08:18:42 2007 +++ php-src/EXTENSIONS Wed Nov 14 22:37:01 2007 @@ -182,8 +182,8 @@ SINCE: 5.1 --- EXTENSION: pdo_firebird -PRIMARY MAINTAINER: Unknown -MAINTENANCE: Odd fixes +PRIMARY MAINTAINER: Lars Westermann [EMAIL PROTECTED] +MAINTENANCE: Maintained STATUS: Working SINCE: 5.1 --- -- 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_firebird firebird_statement.c
lwe Wed Nov 14 23:19:30 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdo_firebird firebird_statement.c Log: # Also nulling cursor_open when closing a named cursor http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_statement.c?r1=1.18.2.1.2.5.2.3r2=1.18.2.1.2.5.2.4diff_format=u Index: php-src/ext/pdo_firebird/firebird_statement.c diff -u php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.3 php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.4 --- php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.3 Wed Nov 14 22:15:21 2007 +++ php-src/ext/pdo_firebird/firebird_statement.c Wed Nov 14 23:19:29 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: firebird_statement.c,v 1.18.2.1.2.5.2.3 2007/11/14 22:15:21 lwe Exp $ */ +/* $Id: firebird_statement.c,v 1.18.2.1.2.5.2.4 2007/11/14 23:19:29 lwe Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -623,6 +623,7 @@ return 0; } *S-name = 0; + S-cursor_open = 0; return 1; } /* }}} */ -- 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/standard dir.c
iliaa Wed Nov 14 23:45:30 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dir.c
Log:
Don't show file names being examined
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.1r2=1.147.2.3.2.12.2.2diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.1
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.2
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.1 Thu Sep 27 18:00:45 2007
+++ php-src/ext/standard/dir.c Wed Nov 14 23:45:29 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.1 2007/09/27 18:00:45 dmitry Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.2 2007/11/14 23:45:29 iliaa Exp $ */
/* {{{ includes/startup/misc */
@@ -467,7 +467,7 @@
array_init(return_value);
for (n = 0; n globbuf.gl_pathc; n++) {
if (PG(safe_mode) || (PG(open_basedir) *PG(open_basedir))) {
- if (PG(safe_mode)
(!php_checkuid(globbuf.gl_pathv[n], NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
+ if (PG(safe_mode)
(!php_checkuid_ex(globbuf.gl_pathv[n], NULL, CHECKUID_CHECK_FILE_AND_DIR,
CHECKUID_NO_ERRORS))) {
basedir_limit = 1;
continue;
} else if
(php_check_open_basedir_ex(globbuf.gl_pathv[n], 0 TSRMLS_CC)) {
--
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_firebird firebird_statement.c
lwe Thu Nov 15 00:25:38 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_firebird firebird_statement.c
Log:
- Fixed bug #43244 (firebird: closeCursor w/o returned data kills process)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/firebird_statement.c?r1=1.18.2.1.2.5.2.5r2=1.18.2.1.2.5.2.6diff_format=u
Index: php-src/ext/pdo_firebird/firebird_statement.c
diff -u php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.5
php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.6
--- php-src/ext/pdo_firebird/firebird_statement.c:1.18.2.1.2.5.2.5 Thu Nov
15 00:10:38 2007
+++ php-src/ext/pdo_firebird/firebird_statement.c Thu Nov 15 00:25:37 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: firebird_statement.c,v 1.18.2.1.2.5.2.5 2007/11/15 00:10:38 lwe Exp $
*/
+/* $Id: firebird_statement.c,v 1.18.2.1.2.5.2.6 2007/11/15 00:25:37 lwe Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -630,7 +630,7 @@
pdo_firebird_stmt *S = (pdo_firebird_stmt*)stmt-driver_data;
/* close the statement handle */
- if (isc_dsql_free_statement(S-H-isc_status, S-stmt, DSQL_close)) {
+ if ((*S-name || S-cursor_open)
isc_dsql_free_statement(H-isc_status, S-stmt, DSQL_close)) {
RECORD_ERROR(stmt);
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
