[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Nov 22 01:32:49 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1202r2=1.1203diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1202 ZendEngine2/ChangeLog:1.1203 --- ZendEngine2/ChangeLog:1.1202Wed Nov 21 01:31:29 2007 +++ ZendEngine2/ChangeLog Thu Nov 22 01:32:49 2007 @@ -1,3 +1,50 @@ +2007-11-21 Dmitry Stogov [EMAIL PROTECTED] + +* zend.h + zend.h + zend_alloc.c + zend_alloc.c: + Macro definitions are moved to zend.h + +* zend_execute.c + zend_execute.c + zend_vm_def.h + zend_vm_def.h + zend_vm_execute.h + zend_vm_execute.h: + Safe exit from executor() + +2007-11-21 Johannes Schl�ter [EMAIL PROTECTED] + +* (PHP_5_3) + zend_compile.c + zend_compile.h + zend_execute_API.c + zend_language_parser.y + zend_opcode.c + zend_vm_def.h + zend_vm_execute.h + zend_vm_opcodes.h + tests/021.phpt: + - MFH Improved version of ternary shortcut (Marcus) + +* tests/021.phpt: + - Improve test + +* (PHP_5_3) + zend_language_parser.y + tests/021.phpt: + - MFH ?: operator (Marcus) +[DOC] expr1 ?: expr1 is a shortcut for: expr1 ? expr1 : expr2 as + exists in gcc and discussed some time back. Note that this is not + an implementation ifsetor($var, default). While ifsetor would not + generate any message for non existing variables or array indices + the ternary shortcut does. Also the ternary shortcut does a + boolean + evaluation rather then checking for isset(). That way ther ternary + shortcut can work on any expression while ifsetor can only work on + variables. Also to be silent one has do do: @$expr1 ?: $expr2. + 2007-11-20 Johannes Schl�ter [EMAIL PROTECTED] * tests/021.phpt @@ -20151,7 +20198,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1202 2007/11/21 01:31:29 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1203 2007/11/22 01:32:49 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -21875,7 +21922,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1202 2007/11/21 01:31:29 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1203 2007/11/22 01:32:49 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src / run-tests.php
janiWed Nov 21 08:20:11 2007 UTC Modified files: /php-srcrun-tests.php Log: - Fixed bug #43035: ignore_repeated_errors=On causes lot of tests to fail http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.331r2=1.332diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.331 php-src/run-tests.php:1.332 --- php-src/run-tests.php:1.331 Mon Nov 12 18:22:10 2007 +++ php-src/run-tests.php Wed Nov 21 08:20:11 2007 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.331 2007/11/12 18:22:10 zoe Exp $ */ +/* $Id: run-tests.php,v 1.332 2007/11/21 08:20:11 jani Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -162,6 +162,7 @@ 'auto_prepend_file=', 'auto_append_file=', 'magic_quotes_runtime=0', + 'ignore_repeated_errors=0', ); function write_information($show_html) @@ -407,7 +408,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.331 $'.\n; + echo '$Revision: 1.332 $'.\n; exit(1); default: echo Illegal switch specified!\n; -- 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) / run-tests.php
janiWed Nov 21 08:20:22 2007 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: MFH:- Fixed bug #43035: ignore_repeated_errors=On causes lot of tests to fail http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.2r2=1.226.2.37.2.35.2.3diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.2 php-src/run-tests.php:1.226.2.37.2.35.2.3 --- php-src/run-tests.php:1.226.2.37.2.35.2.2 Mon Nov 12 18:26:37 2007 +++ php-src/run-tests.php Wed Nov 21 08:20:22 2007 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.2 2007/11/12 18:26:37 zoe Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.3 2007/11/21 08:20:22 jani Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -174,6 +174,7 @@ 'auto_prepend_file=', 'auto_append_file=', 'magic_quotes_runtime=0', + 'ignore_repeated_errors=0', ); function write_information($show_html) @@ -400,7 +401,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.2 $'.\n; + echo '$Revision: 1.226.2.37.2.35.2.3 $'.\n; exit(1); case 'u': -- 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) / run-tests.php
janiWed Nov 21 08:20:45 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcrun-tests.php Log: MFH:- Fixed bug #43035: ignore_repeated_errors=On causes lot of tests to fail http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.36r2=1.226.2.37.2.37diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.36 php-src/run-tests.php:1.226.2.37.2.37 --- php-src/run-tests.php:1.226.2.37.2.36 Mon Nov 12 21:16:27 2007 +++ php-src/run-tests.php Wed Nov 21 08:20:45 2007 @@ -1,3 +1,4 @@ +#!/usr/bin/php ?php /* +--+ @@ -23,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.36 2007/11/12 21:16:27 zoe Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.37 2007/11/21 08:20:45 jani Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -173,6 +174,7 @@ 'auto_prepend_file=', 'auto_append_file=', 'magic_quotes_runtime=0', + 'ignore_repeated_errors=0', ); function write_information($show_html) @@ -399,7 +401,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.36 $'.\n; + echo '$Revision: 1.226.2.37.2.37 $'.\n; exit(1); case 'u': -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
helly Wed Nov 21 10:37:12 2007 UTC Modified files: /CVSROOTavail Log: - upgrade david http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1329r2=1.1330diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1329 CVSROOT/avail:1.1330 --- CVSROOT/avail:1.1329Thu Nov 15 15:32:59 2007 +++ CVSROOT/avail Wed Nov 21 10:37:12 2007 @@ -275,7 +275,7 @@ avail|wharmby|php-src avail|void|pecl/bbcode avail|sankazim|pecl/amf -avail|davidc|phpweb,pecl/phar +avail|davidc|phpweb,pecl/phar,pecl/spl_types avail|sankazim|pecl/amfext avail|doury|pecl/ims avail|janisto|pear/Validate,peardoc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard filestat.c
janiWed Nov 21 11:28:26 2007 UTC
Modified files:
/php-src/ext/standard filestat.c
Log:
- Fix crash when chown() 2nd parameter is something else than integer or
string
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.169r2=1.170diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.169
php-src/ext/standard/filestat.c:1.170
--- php-src/ext/standard/filestat.c:1.169 Mon Nov 19 15:55:48 2007
+++ php-src/ext/standard/filestat.c Wed Nov 21 11:28:26 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.169 2007/11/19 15:55:48 dmitry Exp $ */
+/* $Id: filestat.c,v 1.170 2007/11/21 11:28:26 jani Exp $ */
#include php.h
#include fopen_wrappers.h
@@ -434,7 +434,8 @@
if (Z_TYPE_P(group) == IS_LONG) {
gid = (gid_t)Z_LVAL_P(group);
} else if (Z_TYPE_P(group) == IS_STRING ||
- Z_TYPE_P(group) == IS_UNICODE) {
+ Z_TYPE_P(group) == IS_UNICODE
+ ) {
if (Z_TYPE_P(group) == IS_UNICODE) {
zval_unicode_to_string(group TSRMLS_CC);
}
@@ -466,7 +467,7 @@
gid = gr-gr_gid;
#endif
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, parameter 2 should
be string or integer, %s given,zend_zval_type_name(group));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, parameter 2 should
be string or integer, %s given, zend_zval_type_name(group));
RETURN_FALSE;
}
@@ -548,8 +549,13 @@
}
if (Z_TYPE_P(user) == IS_LONG) {
- uid = (uid_t)Z_LVAL_P(user);
- } else {
+ uid = (uid_t) Z_LVAL_P(user);
+ } else if (Z_TYPE_P(user) == IS_STRING ||
+ Z_TYPE_P(user) == IS_UNICODE
+ ) {
+ if (Z_TYPE_P(user) == IS_UNICODE) {
+ zval_unicode_to_string(user TSRMLS_CC);
+ }
#if defined(ZTS) defined(_SC_GETPW_R_SIZE_MAX) defined(HAVE_GETPWNAM_R)
struct passwd pw;
struct passwd *retpwptr = NULL;
@@ -577,6 +583,9 @@
}
uid = pw-pw_uid;
#endif
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, parameter 2 should
be string or integer, %s given, zend_zval_type_name(user));
+ RETURN_FALSE;
}
if (filename_type == IS_UNICODE) {
--
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 chown.phpt
janiWed Nov 21 11:31:49 2007 UTC Added files: /php-src/ext/standard/tests/filechown.phpt Log: - Added test for chown bug http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chown.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/chown.phpt +++ php-src/ext/standard/tests/file/chown.phpt --TEST-- chown() with NULL as user name --FILE-- ?php chown(sjhgfskhagkfdgskjfhgskfsdgfkdsajf, NULL); echo ALIVE\n; ? --EXPECTF-- Warning: chown(): parameter 2 should be string or integer, null given in %schown.php on line %d ALIVE --UEXPECTF-- Warning: chown(): parameter 2 should be string or integer, null given in %schown.php on line %d 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 chown.phpt
janiWed Nov 21 11:32:16 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filechown.phpt Log: MFH: chown bug test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chown.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/chown.phpt +++ php-src/ext/standard/tests/file/chown.phpt --TEST-- chown() with NULL as user name --FILE-- ?php chown(sjhgfskhagkfdgskjfhgskfsdgfkdsajf, NULL); echo ALIVE\n; ? --EXPECTF-- Warning: chown(): parameter 2 should be string or integer, null given in %schown.php on line %d ALIVE --UEXPECTF-- Warning: chown(): parameter 2 should be string or integer, null given in %schown.php on line %d 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_2) /ext/pcre/tests preg_grep_basic.phpt preg_grep_error.phpt preg_grep_error1.phpt preg_grep_error2.phpt preg_match_all_basic.phpt preg_match_all_error.phpt preg_match_all
nicholsrWed Nov 21 18:21:18 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/pcre/tests preg_quote_error.phpt preg_quote_error1.phpt preg_split_basic.phpt preg_replace_error1.phpt preg_replace_variation1.phpt preg_match_error1.phpt preg_quote_basic.phpt preg_replace_callback_basic.phpt preg_match_error2.phpt preg_match_all_error.phpt preg_grep_error2.phpt preg_match_all_error3.phpt preg_match_all_basic.phpt preg_grep_basic.phpt preg_split_error1.phpt preg_replace_callback_error.phpt preg_grep_error.phpt preg_replace_error.phpt preg_match_basic.phpt preg_match_all_error2.phpt preg_grep_error1.phpt preg_match_all_error1.phpt preg_split_error.phpt preg_split_error2.phpt preg_replace_basic.phpt preg_replace_error2.phpt preg_match_error.phpt Log: Add some more pcre tests http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_error.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_quote_error.phpt +++ php-src/ext/pcre/tests/preg_quote_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_error1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_quote_error1.phpt +++ php-src/ext/pcre/tests/preg_quote_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_split_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_split_basic.phpt +++ php-src/ext/pcre/tests/preg_split_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_error1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_replace_error1.phpt +++ php-src/ext/pcre/tests/preg_replace_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_replace_variation1.phpt +++ php-src/ext/pcre/tests/preg_replace_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_error1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_error1.phpt +++ php-src/ext/pcre/tests/preg_match_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_quote_basic.phpt +++ php-src/ext/pcre/tests/preg_quote_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_callback_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_replace_callback_basic.phpt +++ php-src/ext/pcre/tests/preg_replace_callback_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_error2.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_error2.phpt +++ php-src/ext/pcre/tests/preg_match_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_all_error.phpt +++ php-src/ext/pcre/tests/preg_match_all_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_grep_error2.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_grep_error2.phpt +++ php-src/ext/pcre/tests/preg_grep_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error3.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_all_error3.phpt +++ php-src/ext/pcre/tests/preg_match_all_error3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_all_basic.phpt +++ php-src/ext/pcre/tests/preg_match_all_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_grep_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_grep_basic.phpt +++ php-src/ext/pcre/tests/preg_grep_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_split_error1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_split_error1.phpt +++ php-src/ext/pcre/tests/preg_split_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_callback_error.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_replace_callback_error.phpt +++ php-src/ext/pcre/tests/preg_replace_callback_error.phpt
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pcre/tests preg_grep_basic.phpt preg_grep_error.phpt preg_grep_error1.phpt preg_grep_error2.phpt preg_match_all_basic.phpt preg_match_all_edit_basic.phpt preg_matc
nicholsrWed Nov 21 18:22:01 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/pcre/tests preg_grep_error.phpt preg_match_all_edit_basic.phpt preg_replace_error1.phpt preg_quote_basic.phpt preg_grep_error2.phpt preg_match_error2.phpt preg_quote_error.phpt preg_split_error2.phpt preg_split_basic.phpt preg_replace_basic.phpt preg_match_all_error1.phpt preg_match_all_error.phpt preg_match_all_basic.phpt preg_replace_edit_basic.phpt preg_replace_variation1.phpt preg_grep_error1.phpt preg_grep_basic.phpt preg_quote_error1.phpt preg_replace_callback_basic.phpt preg_match_error1.phpt preg_replace_error2.phpt preg_split_error1.phpt preg_match_error.phpt preg_replace_error.phpt preg_match_basic_edit.phpt preg_match_all_error2.phpt preg_match_all_error3.phpt preg_split_error.phpt preg_match_basic.phpt preg_replace_callback_error.phpt Log: Add some more pcre tests http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_grep_error.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_grep_error.phpt +++ php-src/ext/pcre/tests/preg_grep_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_edit_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_all_edit_basic.phpt +++ php-src/ext/pcre/tests/preg_match_all_edit_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_error1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_replace_error1.phpt +++ php-src/ext/pcre/tests/preg_replace_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_quote_basic.phpt +++ php-src/ext/pcre/tests/preg_quote_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_grep_error2.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_grep_error2.phpt +++ php-src/ext/pcre/tests/preg_grep_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_error2.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_error2.phpt +++ php-src/ext/pcre/tests/preg_match_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_error.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_quote_error.phpt +++ php-src/ext/pcre/tests/preg_quote_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_split_error2.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_split_error2.phpt +++ php-src/ext/pcre/tests/preg_split_error2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_split_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_split_basic.phpt +++ php-src/ext/pcre/tests/preg_split_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_replace_basic.phpt +++ php-src/ext/pcre/tests/preg_replace_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_all_error1.phpt +++ php-src/ext/pcre/tests/preg_match_all_error1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_all_error.phpt +++ php-src/ext/pcre/tests/preg_match_all_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_match_all_basic.phpt +++ php-src/ext/pcre/tests/preg_match_all_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_edit_basic.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_replace_edit_basic.phpt +++ php-src/ext/pcre/tests/preg_replace_edit_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_replace_variation1.phpt +++ php-src/ext/pcre/tests/preg_replace_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_grep_error1.phpt?view=markuprev=1.1 Index: php-src/ext/pcre/tests/preg_grep_error1.phpt +++
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pgsql pgsql.c
iliaa Thu Nov 22 00:17:28 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pgsql pgsql.c
Log:
Fixed bug #43041 (micro-optimizations in pgsql data retrieval) Initial patch
by andy at petdance dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.24.2.4r2=1.331.2.13.2.24.2.5diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.4
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.5
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.4 Tue Nov 13 20:05:47 2007
+++ php-src/ext/pgsql/pgsql.c Thu Nov 22 00:17:28 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.331.2.13.2.24.2.4 2007/11/13 20:05:47 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.24.2.5 2007/11/22 00:17:28 iliaa Exp $ */
#include stdlib.h
@@ -1996,8 +1996,7 @@
pgsql_result_handle *pg_result;
int i, num_fields, pgsql_row, use_row;
longrow = -1;
- char*element, *field_name;
- uintelement_len;
+ char*field_name;
zval*ctor_params = NULL;
zend_class_entry *ce = NULL;
@@ -2068,12 +2067,12 @@
add_assoc_null(return_value, field_name);
}
} else {
- element = PQgetvalue(pgsql_result, pgsql_row, i);
- element_len = (element ? strlen(element) : 0);
+ char *element = PQgetvalue(pgsql_result, pgsql_row, i);
if (element) {
char *data;
int data_len;
int should_copy=0;
+ const uint element_len = strlen(element);
if (PG(magic_quotes_runtime)) {
data = php_addslashes(element,
element_len, data_len, 0 TSRMLS_CC);
@@ -5743,8 +5742,8 @@
PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array
TSRMLS_DC)
{
zval *row;
- char *field_name, *element, *data;
- size_t num_fields, element_len, data_len;
+ char *field_name;
+ size_t num_fields;
int pg_numrows, pg_row;
uint i;
assert(Z_TYPE_P(ret_array) == IS_ARRAY);
@@ -5761,9 +5760,12 @@
field_name = PQfname(pg_result, i);
add_assoc_null(row, field_name);
} else {
- element = PQgetvalue(pg_result, pg_row, i);
- element_len = (element ? strlen(element) : 0);
+ char *element = PQgetvalue(pg_result, pg_row,
i);
if (element) {
+ char *data;
+ size_t data_len;
+ const size_t element_len =
strlen(element);
+
if (PG(magic_quotes_runtime)) {
data = php_addslashes(element,
element_len, data_len, 0 TSRMLS_CC);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c
iliaa Thu Nov 22 00:20:40 2007 UTC
Modified files:
/php-src/ext/pgsql pgsql.c
Log:
MFB: Fixed bug #43041 (micro-optimizations in pgsql data retrieval)
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.375r2=1.376diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.375 php-src/ext/pgsql/pgsql.c:1.376
--- php-src/ext/pgsql/pgsql.c:1.375 Tue Nov 13 20:08:17 2007
+++ php-src/ext/pgsql/pgsql.c Thu Nov 22 00:20:40 2007
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.375 2007/11/13 20:08:17 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.376 2007/11/22 00:20:40 iliaa Exp $ */
#include stdlib.h
@@ -1986,8 +1986,7 @@
pgsql_result_handle *pg_result;
int i, num_fields, pgsql_row, use_row;
longrow = -1;
- char*element, *field_name;
- uintelement_len;
+ char*field_name;
zval*ctor_params = NULL;
zend_class_entry *ce = NULL;
@@ -2058,12 +2057,12 @@
add_assoc_null(return_value, field_name);
}
} else {
- element = PQgetvalue(pgsql_result, pgsql_row, i);
- element_len = (element ? strlen(element) : 0);
+ char *element = PQgetvalue(pgsql_result, pgsql_row, i);
if (element) {
char *data;
int data_len;
int should_copy=0;
+ const uint element_len = strlen(element);
data = safe_estrndup(element, element_len);
data_len = element_len;
@@ -5720,8 +5719,8 @@
PHP_PGSQL_API int php_pgsql_result2array(PGresult *pg_result, zval *ret_array
TSRMLS_DC)
{
zval *row;
- char *field_name, *element, *data;
- size_t num_fields, element_len, data_len;
+ char *field_name;
+ size_t num_fields;
int pg_numrows, pg_row;
uint i;
assert(Z_TYPE_P(ret_array) == IS_ARRAY);
@@ -5738,11 +5737,10 @@
field_name = PQfname(pg_result, i);
add_assoc_null(row, field_name);
} else {
- element = PQgetvalue(pg_result, pg_row, i);
- element_len = (element ? strlen(element) : 0);
+ char *element = PQgetvalue(pg_result, pg_row,
i);
if (element) {
- data = safe_estrndup(element,
element_len);
- data_len = element_len;
+ data_len = strlen(element);
+ data = safe_estrndup(element, data_len);
field_name = PQfname(pg_result, i);
add_assoc_stringl(row, field_name,
data, data_len, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
