[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed Nov 21 01:31:26 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2874r2=1.2875diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2874 php-src/ChangeLog:1.2875 --- php-src/ChangeLog:1.2874Tue Nov 20 01:31:29 2007 +++ php-src/ChangeLog Wed Nov 21 01:31:25 2007 @@ -1,3 +1,195 @@ +2007-11-20 Johannes Schl�ter [EMAIL PROTECTED] + +* ZendEngine2/tests/021.phpt + ZendEngine2/tests/021.phpt: + + - Add test + +2007-11-20 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/pdo/pdo_stmt.c: + + revert previous pdo patch + +* (PHP_5_2) + ext/pdo/pdo_stmt.c + ext/pdo_pgsql/pgsql_statement.c: + + MFB: Adjusted fix for bug #42978 + +* (PHP_5_3) + ext/pdo/pdo_stmt.c + ext/pdo_pgsql/pgsql_statement.c: + + Adjusted fix for bug #42978 + +2007-11-20 Hannes Magnusson [EMAIL PROTECTED] + +* ext/standard/basic_functions.c + ext/standard/tests/general_functions/getopt_004.phpt + ext/standard/tests/general_functions/getopt_005.phpt + main/getopt.c: + - Add support for optional values + - Add support for = as seperator + +2007-11-20 Johannes Schl�ter [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS + ext/standard/basic_functions.c + ext/standard/streamsfuncs.c + ext/standard/streamsfuncs.h + ext/standard/tests/file/stream_supports_lock.phpt: + MFH: Add stream_supports_lock() function (Benjamin Schulz) + +* ext/standard/basic_functions.c + ext/standard/streamsfuncs.c + ext/standard/streamsfuncs.h + ext/standard/tests/file/stream_supports_lock.phpt + ext/standard/tests/file/stream_supports_lock.phpt: + Add stream_supports_lock() function (Benjamin Schulz) + +* ZendEngine2/zend_constants.c: + - Fix build + +2007-11-20 Lars Westermann [EMAIL PROTECTED] + +* (PHP_5_3) + ext/interbase/ibase_query.c: + Win32 still fails to build ... + +2007-11-20 Johannes Schl�ter [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS + ext/sysvmsg/php_sysvmsg.h + ext/sysvmsg/sysvmsg.c + ext/sysvmsg/tests/003.phpt: + MFH: Add msg_queue_exists() function (Benjamin Schulz) [DOC] + +* ext/sysvmsg/tests/003.phpt + ext/sysvmsg/tests/003.phpt: + + Add msg_queue_exists() function (Benjamin Schulz) + +* ext/sysvmsg/php_sysvmsg.h + ext/sysvmsg/sysvmsg.c: + Add msg_queue_exists() function (Benjamin Schulz) + +2007-11-20 Lars Westermann [EMAIL PROTECTED] + +* (PHP_5_3) + ext/interbase/ibase_query.c: + Win32 fails to build + +2007-11-20 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h: + dead code + +2007-11-20 Jani Taskinen [EMAIL PROTECTED] + +* ZendEngine2/zend_constants.c: + - Added ZEND_DEBUG_BUILD constant + +2007-11-20 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/pdo/pdo_stmt.c + ext/pdo/pdo_stmt.c: + + MFB: Fixed bug #42978 (mismatch between number of bound params and values + causes a crash in pdo_pgsql) + +* (PHP_5_3) + ext/pdo/pdo_stmt.c: + Fixed bug #42978 (mismatch between number of bound params and values causes + a crash in pdo_pgsql) + +2007-11-20 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h: + Optimization of zend_do_fcall_common_helper() + +* (PHP_5_3) + ZendEngine2/zend_operators.c: + MFH: math and comparison optimization + use macroses + +* ZendEngine2/zend_operators.c: + math and comparison optimization + +* ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.c: + ZEND_FETCH_DIM optimization + +* ZendEngine2/zend.h + ZendEngine2/zend.h: + Fixed compilation on some systems (Wez) + +* (PHP_5_3) + NEWS + ZendEngine2/zend_API.c + ZendEngine2/zend_execute.c + ZendEngine2/zend_execute.c + ZendEngine2/zend_execute_API.c + ZendEngine2/zend_execute_API.c + ZendEngine2/zend_globals.h + ZendEngine2/zend_globals.h + ZendEngine2/zend_object_handlers.c + ZendEngine2/zend_object_handlers.c + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_def.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.skl + ZendEngine2/zend_vm_execute.skl + ext/com_dotnet/com_com.c + ext/com_dotnet/com_com.c + ext/com_dotnet/com_handlers.c + ext/com_dotnet/com_handlers.c + ext/spl/php_spl.c + ext/spl/php_spl.c: + Fixed bug #43136 (possible crash on script execution timeout. The + EG(function_state_ptr) is completely removed, + EG(current_execute_data)-function_state must be
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Nov 21 01:31:29 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1201r2=1.1202diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1201 ZendEngine2/ChangeLog:1.1202 --- ZendEngine2/ChangeLog:1.1201Tue Nov 20 01:31:32 2007 +++ ZendEngine2/ChangeLog Wed Nov 21 01:31:29 2007 @@ -1,3 +1,89 @@ +2007-11-20 Johannes Schl�ter [EMAIL PROTECTED] + +* tests/021.phpt + tests/021.phpt: + + - Add test + +* zend_constants.c: + - Fix build + +2007-11-20 Dmitry Stogov [EMAIL PROTECTED] + +* zend_vm_def.h + zend_vm_execute.h: + dead code + +2007-11-20 Jani Taskinen [EMAIL PROTECTED] + +* zend_constants.c: + - Added ZEND_DEBUG_BUILD constant + +2007-11-20 Dmitry Stogov [EMAIL PROTECTED] + +* zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h: + Optimization of zend_do_fcall_common_helper() + +* (PHP_5_3) + zend_operators.c: + MFH: math and comparison optimization + use macroses + +* zend_operators.c: + math and comparison optimization + +* zend_execute.c + zend_execute.c: + ZEND_FETCH_DIM optimization + +* zend.h + zend.h: + Fixed compilation on some systems (Wez) + +* (PHP_5_3) + zend_API.c + zend_execute.c + zend_execute.c + zend_execute_API.c + zend_execute_API.c + zend_globals.h + zend_globals.h + zend_object_handlers.c + zend_object_handlers.c + zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h + zend_vm_execute.skl + zend_vm_execute.skl: + Fixed bug #43136 (possible crash on script execution timeout. The + EG(function_state_ptr) is completely removed, + EG(current_execute_data)-function_state must be used instead) + +* zend_compile.c + zend_compile.c + zend_compile.h + zend_compile.h + zend_language_parser.y + zend_language_parser.y + tests/lsb_006.phpt + tests/lsb_006.phpt + tests/lsb_007.phpt + tests/lsb_007.phpt + tests/ns_057.phpt + tests/ns_058.phpt: + Added support for namespace:: prefix that is resolved to current + namespace name. + +* tests/ns_057.phpt + tests/ns_057.phpt + tests/ns_058.phpt + tests/ns_058.phpt: + + file ns_057.phpt was initially added on branch PHP_5_3. + 2007-11-19 Dmitry Stogov [EMAIL PROTECTED] * tests/bug29674.phpt @@ -20065,7 +20151,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1201 2007/11/20 01:31:32 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1202 2007/11/21 01:31:29 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -21789,7 +21875,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1201 2007/11/20 01:31:32 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1202 2007/11/21 01:31:29 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/com_dotnet com_com.c com_handlers.c /ext/spl php_spl.c ZendEngine2 zend_API.c zend_execute.c zend_execute_API.c zend_globals.h zend_object_handlers.c zen
dmitry Tue Nov 20 09:51:14 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/ZendEngine2zend_API.c zend_execute.c zend_execute_API.c
zend_globals.h zend_object_handlers.c zend_vm_def.h
zend_vm_execute.h zend_vm_execute.skl
/php-src/ext/com_dotnet com_com.c com_handlers.c
/php-src/ext/splphp_spl.c
Log:
Fixed bug #43136 (possible crash on script execution timeout. The
EG(function_state_ptr) is completely removed,
EG(current_execute_data)-function_state must be used instead)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.47r2=1.2027.2.547.2.965.2.48diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.47
php-src/NEWS:1.2027.2.547.2.965.2.48
--- php-src/NEWS:1.2027.2.547.2.965.2.47Mon Nov 12 11:23:04 2007
+++ php-src/NEWSTue Nov 20 09:51:11 2007
@@ -56,6 +56,9 @@
- Fixed possible crash in ext/soap because of uninitialized value. (Zdash Urf)
+- Fixed bug #43136 (possible crash on script execution timeout.
+ The EG(function_state_ptr) is completely removed,
+ EG(current_execute_data)-function_state must be used instead). (Dmitry)
- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dmitry)
- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines).
(Nuno)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.34.2.10r2=1.296.2.27.2.34.2.11diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.34.2.10
ZendEngine2/zend_API.c:1.296.2.27.2.34.2.11
--- ZendEngine2/zend_API.c:1.296.2.27.2.34.2.10 Mon Nov 5 11:43:31 2007
+++ ZendEngine2/zend_API.c Tue Nov 20 09:51:11 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.34.2.10 2007/11/05 11:43:31 jani Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.34.2.11 2007/11/20 09:51:11 dmitry Exp $ */
#include zend.h
#include zend_execute.h
@@ -689,7 +689,7 @@
case '+':
if (have_varargs) {
if (!quiet) {
- zend_function *active_function
= EG(function_state_ptr)-function;
+ zend_function *active_function
= EG(current_execute_data)-function_state.function;
char *class_name =
active_function-common.scope ? active_function-common.scope-name : ;
zend_error(E_WARNING,
%s%s%s(): only one varargs specifier (* or +) is permitted,
class_name,
@@ -709,7 +709,7 @@
default:
if (!quiet) {
- zend_function *active_function =
EG(function_state_ptr)-function;
+ zend_function *active_function =
EG(current_execute_data)-function_state.function;
char *class_name =
active_function-common.scope ? active_function-common.scope-name : ;
zend_error(E_WARNING, %s%s%s(): bad
type specifier while parsing parameters,
class_name,
@@ -732,7 +732,7 @@
if (num_args min_num_args || (num_args max_num_args max_num_args
0)) {
if (!quiet) {
- zend_function *active_function =
EG(function_state_ptr)-function;
+ zend_function *active_function =
EG(current_execute_data)-function_state.function;
char *class_name = active_function-common.scope ?
active_function-common.scope-name : ;
zend_error(E_WARNING, %s%s%s() expects %s %d
parameter%s, %d given,
class_name,
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.716.2.12.2.24.2.4r2=1.716.2.12.2.24.2.5diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.4
ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.5
--- ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.4 Sun Oct 7 05:22:03 2007
+++ ZendEngine2/zend_execute.c Tue Nov 20 09:51:11 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.4 2007/10/07 05:22:03 davidw Exp $
*/
+/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.5 2007/11/20 09:51:11 dmitry Exp $
*/
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -1425,6 +1425,7 @@
} \
EG(in_execution) = EX(original_in_execution); \
EG(current_execute_data) = EX(prev_execute_data); \
+ EG(opline_ptr) =
[PHP-CVS] cvs: php-src /ext/com_dotnet com_com.c com_handlers.c /ext/spl php_spl.c ZendEngine2 zend_execute.c zend_execute_API.c zend_globals.h zend_object_handlers.c zend_vm_def.h zend_vm_execute.h
dmitry Tue Nov 20 09:51:44 2007 UTC
Modified files:
/ZendEngine2zend_execute.c zend_execute_API.c zend_globals.h
zend_object_handlers.c zend_vm_def.h zend_vm_execute.h
zend_vm_execute.skl
/php-src/ext/com_dotnet com_com.c com_handlers.c
/php-src/ext/splphp_spl.c
Log:
Fixed bug #43136 (possible crash on script execution timeout. The
EG(function_state_ptr) is completely removed,
EG(current_execute_data)-function_state must be used instead)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.771r2=1.772diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.771 ZendEngine2/zend_execute.c:1.772
--- ZendEngine2/zend_execute.c:1.771Sun Oct 7 05:15:02 2007
+++ ZendEngine2/zend_execute.c Tue Nov 20 09:51:43 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute.c,v 1.771 2007/10/07 05:15:02 davidw Exp $ */
+/* $Id: zend_execute.c,v 1.772 2007/11/20 09:51:43 dmitry Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -1445,6 +1445,7 @@
} \
EG(in_execution) = EX(original_in_execution); \
EG(current_execute_data) = EX(prev_execute_data); \
+ EG(opline_ptr) = NULL; \
ZEND_VM_RETURN()
#include zend_vm_execute.h
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.423r2=1.424diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.423
ZendEngine2/zend_execute_API.c:1.424
--- ZendEngine2/zend_execute_API.c:1.423Fri Nov 2 10:11:59 2007
+++ ZendEngine2/zend_execute_API.c Tue Nov 20 09:51:43 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute_API.c,v 1.423 2007/11/02 10:11:59 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.424 2007/11/20 09:51:43 dmitry Exp $ */
#include stdio.h
#include signal.h
@@ -362,11 +362,11 @@
}
return EMPTY_ZSTR;
}
- switch (EG(function_state_ptr)-function-type) {
+ switch (EG(current_execute_data)-function_state.function-type) {
case ZEND_USER_FUNCTION:
case ZEND_INTERNAL_FUNCTION:
{
- zend_class_entry *ce =
EG(function_state_ptr)-function-common.scope;
+ zend_class_entry *ce =
EG(current_execute_data)-function_state.function-common.scope;
if (space) {
*space = ce ? :: : ;
@@ -389,9 +389,9 @@
if (!zend_is_executing(TSRMLS_C)) {
return NULL_ZSTR;
}
- switch (EG(function_state_ptr)-function-type) {
+ switch (EG(current_execute_data)-function_state.function-type) {
case ZEND_USER_FUNCTION: {
- zstr function_name = ((zend_op_array *)
EG(function_state_ptr)-function)-function_name;
+ zstr function_name = ((zend_op_array
*)EG(current_execute_data)-function_state.function)-function_name;
if (function_name.v) {
return function_name;
@@ -404,7 +404,7 @@
}
break;
case ZEND_INTERNAL_FUNCTION:
- return ((zend_internal_function *)
EG(function_state_ptr)-function)-function_name;
+ return ((zend_internal_function
*)EG(current_execute_data)-function_state.function)-function_name;
break;
default:
return NULL_ZSTR;
@@ -655,7 +655,6 @@
zend_uint i;
zval **original_return_value;
HashTable *calling_symbol_table;
- zend_function_state *original_function_state_ptr;
zend_op_array *original_op_array;
zend_op **original_opline_ptr;
zend_class_entry *current_scope;
@@ -1045,9 +1044,6 @@
zend_ptr_stack_2_push(EG(argument_stack), (void *) (zend_uintptr_t)
fci-param_count, NULL);
- original_function_state_ptr = EG(function_state_ptr);
- EG(function_state_ptr) = EX(function_state);
-
current_scope = EG(scope);
EG(scope) = calling_scope;
@@ -1136,7 +1132,6 @@
zval_ptr_dtor(method_name);
zval_ptr_dtor(params_array);
}
- EG(function_state_ptr) = original_function_state_ptr;
if (EG(This)) {
zval_ptr_dtor(EG(This));
@@ -1316,7 +1311,6 @@
zval pv;
zend_op_array *new_op_array;
zend_op_array *original_active_op_array = EG(active_op_array);
- zend_function_state *original_function_state_ptr =
EG(function_state_ptr);
zend_uchar original_handle_op_arrays;
int retval;
@@ -1382,7 +1376,6 @@
EG(no_extensions)=0;
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c
iliaa Tue Nov 20 14:22:27 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_stmt.c
Log:
Fixed bug #42978 (mismatch between number of bound params and values causes
a crash in pdo_pgsql)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.5r2=1.118.2.38.2.24.2.6diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.5
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.6
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.5 Wed Oct 31 12:57:51 2007
+++ php-src/ext/pdo/pdo_stmt.c Tue Nov 20 14:22:27 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.5 2007/10/31 12:57:51 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.6 2007/11/20 14:22:27 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -168,6 +168,11 @@
iterate:
if (ht) {
+ if (zend_hash_num_elements(stmt-bound_param_map) !=
zend_hash_num_elements(ht)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of
bound paramters %d does not match number of bound values %d,
zend_hash_num_elements(stmt-bound_param_map), zend_hash_num_elements(ht));
+ return 0;
+ }
+
zend_hash_internal_pointer_reset(ht);
while (SUCCESS == zend_hash_get_current_data(ht,
(void**)param)) {
if (!stmt-methods-param_hook(stmt, param, event_type
TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c
iliaa Tue Nov 20 14:22:40 2007 UTC
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
MFB: Fixed bug #42978 (mismatch between number of bound params and values
causes a crash in pdo_pgsql)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.180r2=1.181diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.180 php-src/ext/pdo/pdo_stmt.c:1.181
--- php-src/ext/pdo/pdo_stmt.c:1.180Wed Oct 31 12:58:39 2007
+++ php-src/ext/pdo/pdo_stmt.c Tue Nov 20 14:22:40 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.180 2007/10/31 12:58:39 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.181 2007/11/20 14:22:40 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -144,6 +144,11 @@
iterate:
if (ht) {
+ if (zend_hash_num_elements(stmt-bound_param_map) !=
zend_hash_num_elements(ht)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of
bound paramters %d does not match number of bound values %d,
zend_hash_num_elements(stmt-bound_param_map), zend_hash_num_elements(ht));
+ return 0;
+ }
+
zend_hash_internal_pointer_reset(ht);
while (SUCCESS == zend_hash_get_current_data(ht,
(void**)param)) {
if (!stmt-methods-param_hook(stmt, param, event_type
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_2) / NEWS /ext/pdo pdo_stmt.c
iliaa Tue Nov 20 14:23:47 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdopdo_stmt.c
/php-srcNEWS
Log:
MFB: Fixed bug #42978 (mismatch between number of bound params and values
causes a crash in pdo_pgsql)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.26r2=1.118.2.38.2.27diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.26
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.27
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.26 Wed Oct 31 12:58:24 2007
+++ php-src/ext/pdo/pdo_stmt.c Tue Nov 20 14:23:46 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.26 2007/10/31 12:58:24 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.27 2007/11/20 14:23:46 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -168,6 +168,11 @@
iterate:
if (ht) {
+ if (zend_hash_num_elements(stmt-bound_param_map) !=
zend_hash_num_elements(ht)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of
bound paramters %d does not match number of bound values %d,
zend_hash_num_elements(stmt-bound_param_map), zend_hash_num_elements(ht));
+ return 0;
+ }
+
zend_hash_internal_pointer_reset(ht);
while (SUCCESS == zend_hash_get_current_data(ht,
(void**)param)) {
if (!stmt-methods-param_hook(stmt, param, event_type
TSRMLS_CC)) {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1015r2=1.2027.2.547.2.1016diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1015 php-src/NEWS:1.2027.2.547.2.1016
--- php-src/NEWS:1.2027.2.547.2.1015Sun Nov 18 14:20:17 2007
+++ php-src/NEWSTue Nov 20 14:23:47 2007
@@ -18,6 +18,8 @@
truncation). (Ilia)
- Fixed bug #43175 (__destruct() throwing an exception with __call() causes
segfault). (Dmitry)
+- Fixed bug #42978 (mismatch between number of bound params and values causes
+ a crash in pdo_pgsql). (Ilia)
- Fixed bug #42937 (__call() method not invoked when methods are called on
parent from child class). (Dmitry)
- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
--
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/pdo pdo_stmt.c
Hi Ilia,
After this fix 39 PDO rleated test are failed for me :(
SIGSEGV
#0 0x083430e9 in _zend_is_inconsistent (ht=0x0,
file=0x849721c /home/dmitry/php/php5.3/Zend/zend_hash.c, line=1015)
at /home/dmitry/php/php5.3/Zend/zend_hash.c:53
#1 0x08345d73 in zend_hash_num_elements (ht=0x0)
at /home/dmitry/php/php5.3/Zend/zend_hash.c:1015
#2 0x081541b7 in dispatch_param_event (stmt=0x8780354,
event_type=PDO_PARAM_EVT_EXEC_PRE)
at /home/dmitry/php/php5.3/ext/pdo/pdo_stmt.c:171
#3 0x08155122 in zim_PDOStatement_execute (ht=0, return_value=0x8788f04,
return_value_ptr=0x0, this_ptr=0x877c6bc, return_value_used=0)
at /home/dmitry/php/php5.3/ext/pdo/pdo_stmt.c:499
#4 0x0835f37c in zend_do_fcall_common_helper_SPEC (execute_data=0xbfbfe9ac)
at /home/dmitry/php/php5.3/Zend/zend_vm_execute.h:190
#5 0x08360097 in ZEND_DO_FCALL_BY_NAME_SPEC_HANDLER
(execute_data=0xbfbfe9ac)
at /home/dmitry/php/php5.3/Zend/zend_vm_execute.h:308
#6 0x0835ee82 in execute (op_array=0x877c164)
at /home/dmitry/php/php5.3/Zend/zend_vm_execute.h:86
#7 0x08337dee in zend_execute_scripts (type=8, retval=0x0, file_count=3)
at /home/dmitry/php/php5.3/Zend/zend.c:1139
#8 0x082dff29 in php_execute_script (primary_file=0xbfc00d30)
at /home/dmitry/php/php5.3/main/main.c:2007
#9 0x083bf974 in main (argc=2, argv=0xbfc00e84)
at /home/dmitry/php/php5.3/sapi/cli/php_cli.c:1140
Dmitry.
-Original Message-
From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED]
Sent: Tuesday, November 20, 2007 5:22 PM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c
iliaa Tue Nov 20 14:22:27 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo pdo_stmt.c
Log:
Fixed bug #42978 (mismatch between number of bound params
and values causes
a crash in pdo_pgsql)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.
118.2.38.2.24.2.5r2=1.118.2.38.2.24.2.6diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.5
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.6
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.5 Wed Oct 31 12:57:51
2007
+++ php-src/ext/pdo/pdo_stmt.c Tue Nov 20 14:22:27 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.5 2007/10/31 12:57:51 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.6 2007/11/20 14:22:27 iliaa Exp
+$ */
/* The PDO Statement Handle Class */
@@ -168,6 +168,11 @@
iterate:
if (ht) {
+ if (zend_hash_num_elements(stmt-bound_param_map) !=
zend_hash_num_elements(ht)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number
of bound paramters %d does not match number of bound values %d,
zend_hash_num_elements(stmt-bound_param_map), zend_hash_num_elements(ht));
+ return 0;
+ }
+
zend_hash_internal_pointer_reset(ht);
while (SUCCESS == zend_hash_get_current_data(ht,
(void**)param)) {
if (!stmt-methods-param_hook(stmt, param,
event_type TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c
On 21.11.2007 00:14, Dmitry Stogov wrote: Hi Ilia, After this fix 39 PDO rleated test are failed for me :( Confirmed. Pay attention to `ht` value here: (gdb) bt #0 0x008c0e87 in _zend_is_inconsistent (ht=0x0, file=0xc22098 /local/qa/5_3/Zend/zend_hash.c, line=1015) at /local/qa/5_3/Zend/zend_hash.c:53 #1 0x008c3f9f in zend_hash_num_elements (ht=0x0) at /local/qa/5_3/Zend/zend_hash.c:1015 -- 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/sysvmsg php_sysvmsg.h sysvmsg.c /ext/sysvmsg/tests 003.phpt
johannesTue Nov 20 21:24:35 2007 UTC
Added files:
/php-src/ext/sysvmsg/tests 003.phpt
Modified files:
/php-src/ext/sysvmsgphp_sysvmsg.h sysvmsg.c
Log:
Add msg_queue_exists() function (Benjamin Schulz)
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/php_sysvmsg.h?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/sysvmsg/php_sysvmsg.h
diff -u php-src/ext/sysvmsg/php_sysvmsg.h:1.9
php-src/ext/sysvmsg/php_sysvmsg.h:1.10
--- php-src/ext/sysvmsg/php_sysvmsg.h:1.9 Mon Jan 8 22:35:25 2007
+++ php-src/ext/sysvmsg/php_sysvmsg.h Tue Nov 20 21:24:34 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_sysvmsg.h,v 1.9 2007/01/08 22:35:25 nlopess Exp $ */
+/* $Id: php_sysvmsg.h,v 1.10 2007/11/20 21:24:34 johannes Exp $ */
#ifndef PHP_SYSVMSG_H
#define PHP_SYSVMSG_H
@@ -48,6 +48,7 @@
PHP_FUNCTION(msg_set_queue);
PHP_FUNCTION(msg_send);
PHP_FUNCTION(msg_receive);
+PHP_FUNCTION(msg_queue_exists);
typedef struct {
key_t key;
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.32 php-src/ext/sysvmsg/sysvmsg.c:1.33
--- php-src/ext/sysvmsg/sysvmsg.c:1.32 Thu Sep 27 18:28:42 2007
+++ php-src/ext/sysvmsg/sysvmsg.c Tue Nov 20 21:24:34 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvmsg.c,v 1.32 2007/09/27 18:28:42 dmitry Exp $ */
+/* $Id: sysvmsg.c,v 1.33 2007/11/20 21:24:34 johannes Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -73,6 +73,7 @@
PHP_FE(msg_remove_queue,NULL)
PHP_FE(msg_stat_queue, NULL)
PHP_FE(msg_set_queue, NULL)
+ PHP_FE(msg_queue_exists,NULL)
{NULL, NULL, NULL} /* Must be the last line in sysvmsg_functions[]
*/
};
/* }}} */
@@ -136,7 +137,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, sysvmsg support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.32 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.33 $);
php_info_print_table_end();
}
/* }}} */
@@ -217,6 +218,24 @@
}
/* }}} */
+/* {{{ proto bool msg_queue_exists(int key)
+ Check wether a message queue exists */
+PHP_FUNCTION(msg_queue_exists)
+{
+ long key;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, key) ==
FAILURE) {
+ return;
+ }
+
+ if (msgget(key, 0) 0) {
+ RETURN_FALSE;
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+
/* {{{ proto resource msg_get_queue(int key [, int perms]) U
Attach to a message queue */
PHP_FUNCTION(msg_get_queue)
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/tests/003.phpt?view=markuprev=1.1
Index: php-src/ext/sysvmsg/tests/003.phpt
+++ php-src/ext/sysvmsg/tests/003.phpt
--TEST--
msg_queue_exists()
--SKIPIF--
?php if (!extension_loaded(sysvmsg)) die(skip sysvmsg extension is not
available)?
--FILE--
?php
$id = ftok(__FILE__, 'r');
msg_remove_queue(msg_get_queue($id, 0600));
var_dump(msg_queue_exists($id));
$res = msg_get_queue($id, 0600);
var_dump($res);
var_dump(msg_queue_exists($id));
var_dump(msg_remove_queue($res));
var_dump(msg_queue_exists($id));
echo Done\n;
?
--EXPECTF--
bool(false)
resource(%d) of type (sysvmsg queue)
bool(true)
bool(true)
bool(false)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/sysvmsg php_sysvmsg.h sysvmsg.c /ext/sysvmsg/tests 003.phpt
johannesTue Nov 20 21:25:10 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/sysvmsg/tests 003.phpt
Modified files:
/php-srcNEWS
/php-src/ext/sysvmsgphp_sysvmsg.h sysvmsg.c
Log:
MFH: Add msg_queue_exists() function (Benjamin Schulz) [DOC]
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.48r2=1.2027.2.547.2.965.2.49diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.48
php-src/NEWS:1.2027.2.547.2.965.2.49
--- php-src/NEWS:1.2027.2.547.2.965.2.48Tue Nov 20 09:51:11 2007
+++ php-src/NEWSTue Nov 20 21:25:10 2007
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 20??, PHP 5.3.0
+- Added msg_queue_exists() function (Benjamin Schulz)
- Added 3 Firebird specific attributes that can be set via PDO::setAttribute()
to control formatting of date/timestamp columns: PDO::FB_ATTR_DATE_FORMAT,
PDO::FB_ATTR_TIME_FORMAT and PDO::FB_ATTR_TIMESTAMP_FORMAT.
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/php_sysvmsg.h?r1=1.6.2.1.2.2r2=1.6.2.1.2.2.2.1diff_format=u
Index: php-src/ext/sysvmsg/php_sysvmsg.h
diff -u php-src/ext/sysvmsg/php_sysvmsg.h:1.6.2.1.2.2
php-src/ext/sysvmsg/php_sysvmsg.h:1.6.2.1.2.2.2.1
--- php-src/ext/sysvmsg/php_sysvmsg.h:1.6.2.1.2.2 Mon Jan 8 22:34:07 2007
+++ php-src/ext/sysvmsg/php_sysvmsg.h Tue Nov 20 21:25:10 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_sysvmsg.h,v 1.6.2.1.2.2 2007/01/08 22:34:07 nlopess Exp $ */
+/* $Id: php_sysvmsg.h,v 1.6.2.1.2.2.2.1 2007/11/20 21:25:10 johannes Exp $ */
#ifndef PHP_SYSVMSG_H
#define PHP_SYSVMSG_H
@@ -48,6 +48,7 @@
PHP_FUNCTION(msg_set_queue);
PHP_FUNCTION(msg_send);
PHP_FUNCTION(msg_receive);
+PHP_FUNCTION(msg_queue_exists);
typedef struct {
key_t key;
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/sysvmsg.c?r1=1.20.2.3.2.6.2.1r2=1.20.2.3.2.6.2.2diff_format=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.1
php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.2
--- php-src/ext/sysvmsg/sysvmsg.c:1.20.2.3.2.6.2.1 Thu Sep 27 18:00:45 2007
+++ php-src/ext/sysvmsg/sysvmsg.c Tue Nov 20 21:25:10 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.1 2007/09/27 18:00:45 dmitry Exp $ */
+/* $Id: sysvmsg.c,v 1.20.2.3.2.6.2.2 2007/11/20 21:25:10 johannes Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -72,6 +72,7 @@
PHP_FE(msg_remove_queue,NULL)
PHP_FE(msg_stat_queue, NULL)
PHP_FE(msg_set_queue, NULL)
+ PHP_FE(msg_queue_exists,NULL)
{NULL, NULL, NULL} /* Must be the last line in sysvmsg_functions[]
*/
};
/* }}} */
@@ -125,7 +126,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, sysvmsg support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.20.2.3.2.6.2.1
$);
+ php_info_print_table_row(2, Revision, $Revision: 1.20.2.3.2.6.2.2
$);
php_info_print_table_end();
}
/* }}} */
@@ -206,6 +207,26 @@
}
/* }}} */
+
+/* {{{ proto bool msg_queue_exists(int key)
+ Check wether a message queue exists */
+PHP_FUNCTION(msg_queue_exists)
+{
+ long key;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, key) ==
FAILURE) {
+ return;
+ }
+
+ if (msgget(key, 0) 0) {
+ RETURN_FALSE;
+ }
+
+ RETURN_TRUE;
+}
+/* }}} */
+
+
/* {{{ proto resource msg_get_queue(int key [, int perms])
Attach to a message queue */
PHP_FUNCTION(msg_get_queue)
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvmsg/tests/003.phpt?view=markuprev=1.1
Index: php-src/ext/sysvmsg/tests/003.phpt
+++ php-src/ext/sysvmsg/tests/003.phpt
--TEST--
msg_queue_exists()
--SKIPIF--
?php if (!extension_loaded(sysvmsg)) die(skip sysvmsg extension is not
available)?
--FILE--
?php
$id = ftok(__FILE__, 'r');
msg_remove_queue(msg_get_queue($id, 0600));
var_dump(msg_queue_exists($id));
$res = msg_get_queue($id, 0600);
var_dump($res);
var_dump(msg_queue_exists($id));
var_dump(msg_remove_queue($res));
var_dump(msg_queue_exists($id));
echo Done\n;
?
--EXPECTF--
bool(false)
resource(%d) of type (sysvmsg queue)
bool(true)
bool(true)
bool(false)
Done
--
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/interbase ibase_query.c
lwe Tue Nov 20 21:36:20 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/interbase ibase_query.c
Log:
Win32 still fails to build ...
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_query.c?r1=1.23.2.1.2.10.2.2r2=1.23.2.1.2.10.2.3diff_format=u
Index: php-src/ext/interbase/ibase_query.c
diff -u php-src/ext/interbase/ibase_query.c:1.23.2.1.2.10.2.2
php-src/ext/interbase/ibase_query.c:1.23.2.1.2.10.2.3
--- php-src/ext/interbase/ibase_query.c:1.23.2.1.2.10.2.2 Tue Nov 20
19:58:39 2007
+++ php-src/ext/interbase/ibase_query.c Tue Nov 20 21:36:20 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: ibase_query.c,v 1.23.2.1.2.10.2.2 2007/11/20 19:58:39 lwe Exp $ */
+/* $Id: ibase_query.c,v 1.23.2.1.2.10.2.3 2007/11/20 21:36:20 lwe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -120,12 +120,12 @@
static void _php_ibase_free_stmt_handle(ibase_db_link *link, isc_stmt_handle
stmt TSRMLS_DC) /* {{{ */
{
+ static char info[] = { isc_info_base_level, isc_info_end };
+
if (stmt) {
+ char res_buf[8];
IBDEBUG(Dropping statement handle (free_stmt_handle)...);
/* Only free statement if db-connection is still open */
- static char info[] = { isc_info_base_level, isc_info_end };
- char res_buf[8];
-
if (SUCCESS == isc_database_info(IB_STATUS, link-handle,
sizeof(info), info,
sizeof(res_buf), res_buf)) {
if (isc_dsql_free_statement(IB_STATUS, stmt,
DSQL_drop)) {
--
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/pdo pdo_stmt.c
I am looking into it now. On 20-Nov-07, at 4:21 PM, Antony Dovgal wrote: On 21.11.2007 00:14, Dmitry Stogov wrote: Hi Ilia, After this fix 39 PDO rleated test are failed for me :( Confirmed. Pay attention to `ht` value here: (gdb) bt #0 0x008c0e87 in _zend_is_inconsistent (ht=0x0, file=0xc22098 /local/qa/5_3/Zend/zend_hash.c, line=1015) at /local/ qa/5_3/Zend/zend_hash.c:53 #1 0x008c3f9f in zend_hash_num_elements (ht=0x0) at /local/ qa/5_3/Zend/zend_hash.c:1015 -- Wbr, Antony Dovgal Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h /ext/standard/tests/file stream_supports_lock.phpt
johannesTue Nov 20 22:16:20 2007 UTC
Added files:
/php-src/ext/standard/tests/filestream_supports_lock.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c streamsfuncs.h
basic_functions.c
Log:
Add stream_supports_lock() function (Benjamin Schulz)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.109r2=1.110diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.109
php-src/ext/standard/streamsfuncs.c:1.110
--- php-src/ext/standard/streamsfuncs.c:1.109 Thu Nov 8 13:29:38 2007
+++ php-src/ext/standard/streamsfuncs.c Tue Nov 20 22:16:19 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.109 2007/11/08 13:29:38 dmitry Exp $ */
+/* $Id: streamsfuncs.c,v 1.110 2007/11/20 22:16:19 johannes Exp $ */
#include php.h
#include php_globals.h
@@ -1677,6 +1677,26 @@
}
/* }}} */
+/* {{{ proto bool stream_supports_lock(resource stream)
+ Tells wether the stream supports locking through flock(). */
+PHP_FUNCTION(stream_supports_lock)
+{
+ php_stream *stream;
+ zval *zsrc;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, zsrc) ==
FAILURE) {
+ RETURN_FALSE;
+ }
+
+ php_stream_from_zval(stream, zsrc);
+
+ if (!php_stream_supports_lock(stream)) {
+ RETURN_FALSE;
+ }
+
+ RETURN_TRUE;
+}
+
#ifdef HAVE_SHUTDOWN
/* {{{ proto int stream_socket_shutdown(resource stream, int how) U
causes all or part of a full-duplex connection on the socket associated
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.h?r1=1.20r2=1.21diff_format=u
Index: php-src/ext/standard/streamsfuncs.h
diff -u php-src/ext/standard/streamsfuncs.h:1.20
php-src/ext/standard/streamsfuncs.h:1.21
--- php-src/ext/standard/streamsfuncs.h:1.20Tue Jul 3 10:22:55 2007
+++ php-src/ext/standard/streamsfuncs.h Tue Nov 20 22:16:20 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: streamsfuncs.h,v 1.20 2007/07/03 10:22:55 dmitry Exp $ */
+/* $Id: streamsfuncs.h,v 1.21 2007/11/20 22:16:20 johannes Exp $ */
/* Flags for stream_socket_client */
#define PHP_STREAM_CLIENT_PERSISTENT 1
@@ -58,6 +58,7 @@
PHP_FUNCTION(stream_socket_pair);
PHP_FUNCTION(stream_resolve_include_path);
PHP_FUNCTION(stream_is_local);
+PHP_FUNCTION(stream_supports_lock);
/*
* Local variables:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.883r2=1.884diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.883
php-src/ext/standard/basic_functions.c:1.884
--- php-src/ext/standard/basic_functions.c:1.883Thu Nov 15 13:11:48 2007
+++ php-src/ext/standard/basic_functions.c Tue Nov 20 22:16:20 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.883 2007/11/15 13:11:48 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.884 2007/11/20 22:16:20 johannes Exp $ */
#include php.h
#include php_streams.h
@@ -2310,6 +2310,11 @@
ZEND_END_ARG_INFO()
static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_supports_lock, 0, 0, 1)
+ZEND_ARG_INFO(0, stream)
+ZEND_END_ARG_INFO()
+
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_select, 0, 0, 4)
ZEND_ARG_INFO(1, read_streams) /* ARRAY_INFO(1, read_streams, 1) */
ZEND_ARG_INFO(1, write_streams) /* ARRAY_INFO(1, write_streams, 1) */
@@ -3532,6 +3537,7 @@
#endif
PHP_FE(stream_copy_to_stream,
arginfo_stream_copy_to_stream)
PHP_FE(stream_get_contents,
arginfo_stream_get_contents)
+ PHP_FE(stream_supports_lock,
arginfo_stream_supports_lock)
PHP_FE(stream_resolve_include_path,
arginfo_stream_resolve_include_path)
PHP_FE(fgetcsv,
arginfo_fgetcsv)
PHP_FE(fputcsv,
arginfo_fputcsv)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/stream_supports_lock.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/stream_supports_lock.phpt
+++ php-src/ext/standard/tests/file/stream_supports_lock.phpt
--TEST--
stream_supports_lock
--FILE--
?php
$fp = fopen(__FILE__, r);
var_dump($fp);
var_dump(stream_supports_lock($fp));
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h /ext/standard/tests/file stream_supports_lock.phpt
johannesTue Nov 20 22:17:01 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filestream_supports_lock.phpt
Modified files:
/php-src/ext/standard streamsfuncs.c streamsfuncs.h
basic_functions.c
/php-srcNEWS
Log:
MFH: Add stream_supports_lock() function (Benjamin Schulz)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.5r2=1.58.2.6.2.15.2.6diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.5
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.6
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.5 Thu Nov 8
13:29:25 2007
+++ php-src/ext/standard/streamsfuncs.c Tue Nov 20 22:17:00 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.5 2007/11/08 13:29:25 dmitry Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.6 2007/11/20 22:17:00 johannes Exp $
*/
#include php.h
#include php_globals.h
@@ -1375,6 +1375,26 @@
}
/* }}} */
+/* {{{ proto bool stream_supports_lock(resource stream)
+ Tells wether the stream supports locking through flock(). */
+PHP_FUNCTION(stream_supports_lock)
+{
+ php_stream *stream;
+ zval *zsrc;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, r, zsrc) ==
FAILURE) {
+ RETURN_FALSE;
+ }
+
+ php_stream_from_zval(stream, zsrc);
+
+ if (!php_stream_supports_lock(stream)) {
+ RETURN_FALSE;
+ }
+
+ RETURN_TRUE;
+}
+
#ifdef HAVE_SHUTDOWN
/* {{{ proto int stream_socket_shutdown(resource stream, int how)
causes all or part of a full-duplex connection on the socket associated
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.h?r1=1.13.2.1.2.4r2=1.13.2.1.2.4.2.1diff_format=u
Index: php-src/ext/standard/streamsfuncs.h
diff -u php-src/ext/standard/streamsfuncs.h:1.13.2.1.2.4
php-src/ext/standard/streamsfuncs.h:1.13.2.1.2.4.2.1
--- php-src/ext/standard/streamsfuncs.h:1.13.2.1.2.4Mon Jul 9 17:27:24 2007
+++ php-src/ext/standard/streamsfuncs.h Tue Nov 20 22:17:00 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: streamsfuncs.h,v 1.13.2.1.2.4 2007/07/09 17:27:24 dmitry Exp $ */
+/* $Id: streamsfuncs.h,v 1.13.2.1.2.4.2.1 2007/11/20 22:17:00 johannes Exp $ */
/* Flags for stream_socket_client */
#define PHP_STREAM_CLIENT_PERSISTENT 1
@@ -56,6 +56,7 @@
PHP_FUNCTION(stream_socket_shutdown);
PHP_FUNCTION(stream_socket_pair);
PHP_FUNCTION(stream_is_local);
+PHP_FUNCTION(stream_supports_lock);
/*
* Local variables:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.12r2=1.725.2.31.2.64.2.13diff_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.12
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.13
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.12 Thu Nov 15
13:13:21 2007
+++ php-src/ext/standard/basic_functions.c Tue Nov 20 22:17:00 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.12 2007/11/15 13:13:21 bjori Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.13 2007/11/20 22:17:00 johannes
Exp $ */
#include php.h
#include php_streams.h
@@ -2319,6 +2319,11 @@
ZEND_END_ARG_INFO()
static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_supports_lock, 0, 0, 1)
+ZEND_ARG_INFO(0, stream)
+ZEND_END_ARG_INFO()
+
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_select, 0, 0, 4)
ZEND_ARG_INFO(1, read_streams) /* ARRAY_INFO(1, read_streams, 1) */
ZEND_ARG_INFO(1, write_streams) /* ARRAY_INFO(1, write_streams, 1) */
@@ -3493,6 +3498,7 @@
#endif
PHP_FE(stream_copy_to_stream,
arginfo_stream_copy_to_stream)
PHP_FE(stream_get_contents,
arginfo_stream_get_contents)
+ PHP_FE(stream_supports_lock,
arginfo_stream_supports_lock)
PHP_FE(fgetcsv,
arginfo_fgetcsv)
PHP_FE(fputcsv,
arginfo_fputcsv)
PHP_FE(flock,
arginfo_flock)
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c /ext/standard/tests/general_functions getopt_004.phpt getopt_005.phpt /main getopt.c
bjori Tue Nov 20 22:42:47 2007 UTC
Added files:
/php-src/ext/standard/tests/general_functions getopt_004.phpt
getopt_005.phpt
Modified files:
/php-src/ext/standard basic_functions.c
/php-src/main getopt.c
Log:
- Add support for optional values
- Add support for = as seperator
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.884r2=1.885diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.884
php-src/ext/standard/basic_functions.c:1.885
--- php-src/ext/standard/basic_functions.c:1.884Tue Nov 20 22:16:20 2007
+++ php-src/ext/standard/basic_functions.c Tue Nov 20 22:42:47 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.884 2007/11/20 22:16:20 johannes Exp $ */
+/* $Id: basic_functions.c,v 1.885 2007/11/20 22:42:47 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -4496,6 +4496,10 @@
paras-opt_name = NULL;
if (paras-need_param == 1) {
opts++;
+ if (*opts == ':') {
+ paras-need_param++;
+ opts++;
+ }
}
paras++;
}
http://cvs.php.net/viewvc.cgi/php-src/main/getopt.c?r1=1.1r2=1.2diff_format=u
Index: php-src/main/getopt.c
diff -u php-src/main/getopt.c:1.1 php-src/main/getopt.c:1.2
--- php-src/main/getopt.c:1.1 Mon Oct 1 12:32:39 2007
+++ php-src/main/getopt.c Tue Nov 20 22:42:47 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: getopt.c,v 1.1 2007/10/01 12:32:39 jani Exp $ */
+/* $Id: getopt.c,v 1.2 2007/11/20 22:42:47 bjori Exp $ */
#include stdio.h
#include string.h
@@ -80,24 +80,36 @@
}
}
if ((argv[*optind][0] == '-') (argv[*optind][1] == '-')) {
+ char *pos;
+ int arg_end = strlen(argv[*optind])-1;
+
/* '--' indicates end of args if not followed by a known long
option name */
if (argv[*optind][2] == '\0') {
(*optind)++;
return(EOF);
}
+ arg_start = 2;
+
+ /* Check for arg=val */
+ if ((pos = php_memnstr(argv[*optind][arg_start], =, 1,
argv[*optind]+arg_end)) != NULL) {
+ arg_end = pos-argv[*optind][arg_start];
+ arg_start++;
+ }
+
+
while (1) {
php_optidx++;
if (opts[php_optidx].opt_char == '-') {
(*optind)++;
return(php_opt_error(argc, argv, *optind-1,
optchr, OPTERRARG, show_err));
- } else if (opts[php_optidx].opt_name
!strcmp(argv[*optind][2], opts[php_optidx].opt_name)) {
+ } else if (opts[php_optidx].opt_name
!strncmp(argv[*optind][2], opts[php_optidx].opt_name, arg_end)) {
break;
}
}
optchr = 0;
dash = 0;
- arg_start = 2 + strlen(opts[php_optidx].opt_name);
+ arg_start += strlen(opts[php_optidx].opt_name);
} else {
if (!dash) {
dash = 1;
@@ -133,14 +145,23 @@
}
if (opts[php_optidx].need_param) {
/* Check for cases where the value of the argument
- is in the form -arg val or in the form -argval */
+ is in the form -arg val, -arg=varl or -argval */
dash = 0;
if (!argv[*optind][arg_start]) {
(*optind)++;
if (*optind == argc) {
- return(php_opt_error(argc, argv, *optind-1,
optchr, OPTERRARG, show_err));
- }
- *optarg = argv[(*optind)++];
+ /* Was the value required or is it optional? */
+ if (opts[php_optidx].need_param == 1) {
+ return(php_opt_error(argc, argv,
*optind-1, optchr, OPTERRARG, show_err));
+ }
+ /* Optional value is not supported with -arg val
style */
+ } else if (opts[php_optidx].need_param == 1) {
+ *optarg = argv[(*optind)++];
+ }
+ } else if (argv[*optind][arg_start] == '=') {
+ arg_start++;
+ *optarg = argv[*optind][arg_start];
+ (*optind)++;
}
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c
iliaa Tue Nov 20 23:12:17 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_pgsql pgsql_statement.c
/php-src/ext/pdopdo_stmt.c
Log:
Adjusted fix for bug #42978
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.7r2=1.31.2.12.2.7.2.1diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7.2.1
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7 Tue Apr 17
15:29:13 2007
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Tue Nov 20 23:12:17 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.7 2007/04/17 15:29:13 iliaa Exp $ */
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.7.2.1 2007/11/20 23:12:17 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -265,6 +265,11 @@
sizeof(Oid));
}
if (param-paramno = 0) {
+ if (param-paramno
zend_hash_num_elements(stmt-bound_param_map)) {
+ pdo_pgsql_error_stmt(stmt,
PGRES_FATAL_ERROR, HY105);
+ return 0;
+ }
+
if (PDO_PARAM_TYPE(param-param_type)
== PDO_PARAM_LOB
Z_TYPE_P(param-parameter) == IS_RESOURCE) {
php_stream *stm;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.6r2=1.118.2.38.2.24.2.7diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.6
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.7
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.6 Tue Nov 20 14:22:27 2007
+++ php-src/ext/pdo/pdo_stmt.c Tue Nov 20 23:12:17 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.6 2007/11/20 14:22:27 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.7 2007/11/20 23:12:17 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -168,11 +168,6 @@
iterate:
if (ht) {
- if (zend_hash_num_elements(stmt-bound_param_map) !=
zend_hash_num_elements(ht)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of
bound paramters %d does not match number of bound values %d,
zend_hash_num_elements(stmt-bound_param_map), zend_hash_num_elements(ht));
- return 0;
- }
-
zend_hash_internal_pointer_reset(ht);
while (SUCCESS == zend_hash_get_current_data(ht,
(void**)param)) {
if (!stmt-methods-param_hook(stmt, param, event_type
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_2) /ext/pdo pdo_stmt.c /ext/pdo_pgsql pgsql_statement.c
iliaa Tue Nov 20 23:12:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo_pgsql pgsql_statement.c
/php-src/ext/pdopdo_stmt.c
Log:
MFB: Adjusted fix for bug #42978
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.7r2=1.31.2.12.2.8diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.8
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.7 Tue Apr 17
15:29:13 2007
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Tue Nov 20 23:12:30 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.7 2007/04/17 15:29:13 iliaa Exp $ */
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.8 2007/11/20 23:12:30 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -265,6 +265,11 @@
sizeof(Oid));
}
if (param-paramno = 0) {
+ if (param-paramno
zend_hash_num_elements(stmt-bound_param_map)) {
+ pdo_pgsql_error_stmt(stmt,
PGRES_FATAL_ERROR, HY105);
+ return 0;
+ }
+
if (PDO_PARAM_TYPE(param-param_type)
== PDO_PARAM_LOB
Z_TYPE_P(param-parameter) == IS_RESOURCE) {
php_stream *stm;
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.27r2=1.118.2.38.2.28diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.27
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.28
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.27 Tue Nov 20 14:23:46 2007
+++ php-src/ext/pdo/pdo_stmt.c Tue Nov 20 23:12:30 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.27 2007/11/20 14:23:46 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.28 2007/11/20 23:12:30 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -168,11 +168,6 @@
iterate:
if (ht) {
- if (zend_hash_num_elements(stmt-bound_param_map) !=
zend_hash_num_elements(ht)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of
bound paramters %d does not match number of bound values %d,
zend_hash_num_elements(stmt-bound_param_map), zend_hash_num_elements(ht));
- return 0;
- }
-
zend_hash_internal_pointer_reset(ht);
while (SUCCESS == zend_hash_get_current_data(ht,
(void**)param)) {
if (!stmt-methods-param_hook(stmt, param, event_type
TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c
iliaa Tue Nov 20 23:27:56 2007 UTC
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
revert previous pdo patch
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.181r2=1.182diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.181 php-src/ext/pdo/pdo_stmt.c:1.182
--- php-src/ext/pdo/pdo_stmt.c:1.181Tue Nov 20 14:22:40 2007
+++ php-src/ext/pdo/pdo_stmt.c Tue Nov 20 23:27:56 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.181 2007/11/20 14:22:40 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.182 2007/11/20 23:27:56 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -144,11 +144,6 @@
iterate:
if (ht) {
- if (zend_hash_num_elements(stmt-bound_param_map) !=
zend_hash_num_elements(ht)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of
bound paramters %d does not match number of bound values %d,
zend_hash_num_elements(stmt-bound_param_map), zend_hash_num_elements(ht));
- return 0;
- }
-
zend_hash_internal_pointer_reset(ht);
while (SUCCESS == zend_hash_get_current_data(ht,
(void**)param)) {
if (!stmt-methods-param_hook(stmt, param, event_type
TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings bug42866.phpt
stasWed Nov 21 02:24:48 2007 UTC
Added files:
/php-src/ext/standard/tests/strings bug42866.phpt
Log:
test for 42866
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug42866.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug42866.phpt
+++ php-src/ext/standard/tests/strings/bug42866.phpt
--TEST--
Bug #42866 str_split() returns extra char when given string size is not
mulitple of lenth
--FILE--
?php
$str = 'Testing str_split()';
$split_length = 5;
var_dump( str_split($str, $split_length) );
?
--EXPECT--
array(4) {
[0]=
string(5) Testi
[1]=
string(5) ng st
[2]=
string(5) r_spl
[3]=
string(4) it()
}
--UEXPECT--
array(4) {
[0]=
unicode(5) Testi
[1]=
unicode(5) ng st
[2]=
unicode(5) r_spl
[3]=
unicode(4) it()
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
stasWed Nov 21 02:27:07 2007 UTC
Modified files:
/php-src/ext/standard string.c
Log:
fix #42866, from Claudio Cherubino
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.655r2=1.656diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.655 php-src/ext/standard/string.c:1.656
--- php-src/ext/standard/string.c:1.655 Sun Oct 7 05:15:06 2007
+++ php-src/ext/standard/string.c Wed Nov 21 02:27:07 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.655 2007/10/07 05:15:06 davidw Exp $ */
+/* $Id: string.c,v 1.656 2007/11/21 02:27:07 stas Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -7802,7 +7802,7 @@
}
if (p != (str.s + str_len * charsize)) {
- add_next_index_zstrl(return_value, str_type, ZSTR(p), (str.s +
str_len * charsize - p), 1);
+ add_next_index_zstrl(return_value, str_type, ZSTR(p), (str.s +
str_len * charsize - p)/charsize, 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) / NEWS
janiWed Nov 21 05:44:34 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Missing bla...credit :) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.51r2=1.2027.2.547.2.965.2.52diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.51 php-src/NEWS:1.2027.2.547.2.965.2.52 --- php-src/NEWS:1.2027.2.547.2.965.2.51Wed Nov 21 00:03:59 2007 +++ php-src/NEWSWed Nov 21 05:44:34 2007 @@ -6,7 +6,7 @@ - Added msg_queue_exists() function. (Benjamin Schulz) - Added 3 Firebird specific attributes that can be set via PDO::setAttribute() to control formatting of date/timestamp columns: PDO::FB_ATTR_DATE_FORMAT, - PDO::FB_ATTR_TIME_FORMAT and PDO::FB_ATTR_TIMESTAMP_FORMAT. + PDO::FB_ATTR_TIME_FORMAT and PDO::FB_ATTR_TIMESTAMP_FORMAT. (Lars W) - Added gmp_testbit() function from HEAD. (Stas) - Added icon format support to getimagesize(). (Scott) - Added LDAP_OPT_NETWORK_TIMEOUT option for ldap_set_option() to allow -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
