[PHP-CVS] cvs: php-src(PHP_5_3) /ext/tokenizer tokenizer.c
dmitry Tue Feb 12 09:28:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/tokenizer tokenizer.c
Log:
Added NOWDOC
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.5.2.7.2.2&r2=1.31.2.5.2.7.2.3&diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.2
php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.3
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.5.2.7.2.2 Mon Dec 31 07:17:16 2007
+++ php-src/ext/tokenizer/tokenizer.c Tue Feb 12 09:28:01 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.2 2007/12/31 07:17:16 sebastian Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.5.2.7.2.3 2008/02/12 09:28:01 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -178,7 +178,7 @@
MAKE_STD_ZVAL(keyword);
array_init(keyword);
add_next_index_long(keyword, token_type);
- if (token_type == T_END_HEREDOC) {
+ if (token_type == T_END_HEREDOC || token_type ==
T_END_NOWDOC) {
if (CG(increment_lineno)) {
token_line = ++CG(zend_lineno);
CG(increment_lineno) = 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tokenizer tokenizer.c
dmitry Tue Feb 12 09:28:31 2008 UTC
Modified files:
/php-src/ext/tokenizer tokenizer.c
Log:
Added NOWDOC
http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer.c?r1=1.45&r2=1.46&diff_format=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.45
php-src/ext/tokenizer/tokenizer.c:1.46
--- php-src/ext/tokenizer/tokenizer.c:1.45 Mon Dec 31 07:12:17 2007
+++ php-src/ext/tokenizer/tokenizer.c Tue Feb 12 09:28:30 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tokenizer.c,v 1.45 2007/12/31 07:12:17 sebastian Exp $ */
+/* $Id: tokenizer.c,v 1.46 2008/02/12 09:28:30 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -180,7 +180,7 @@
MAKE_STD_ZVAL(keyword);
array_init(keyword);
add_next_index_long(keyword, token_type);
- if (token_type == T_END_HEREDOC) {
+ if (token_type == T_END_HEREDOC || token_type ==
T_END_NOWDOC) {
if (CG(increment_lineno)) {
token_line = ++CG(zend_lineno);
CG(increment_lineno) = 0;
--
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/mysqli mysqli.c /ext/mysqlnd mysqlnd.h mysqlnd_debug.c mysqlnd_debug.h mysqlnd_enum_n_def.h mysqlnd_structs.h
On 11.02.2008 19:44, Andrey Hristov wrote:
> + REGISTER_LONG_CONSTANT("MYSQLI_ENUM_FLAG", ENUM_FLAG, CONST_CS |
> CONST_PERSISTENT);
> + REGISTER_LONG_CONSTANT("MYSQLI_BINARY_FLAG", BINARY_FLAG, CONST_CS |
> CONST_PERSISTENT);
> + REGISTER_LONG_CONSTANT("MYSQLI_NO_DEFAULT_VALUE_FLAG",
> NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT);
> +
> +#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 6) ||
> (MYSQLI_VERSION_ID > 60003) || defined(HAVE_MYSQLND)
^ typo ??
> + REGISTER_LONG_CONSTANT("MYSQLI_ON_UPDATE_NOW_FLAG", ON_UPDATE_NOW_FLAG,
> CONST_CS | CONST_PERSISTENT);
> +#endif
/local/qa/5_3.gcov/ext/mysqli/mysqli.c: In function 'zm_startup_mysqli':
/local/qa/5_3.gcov/ext/mysqli/mysqli.c:733: error: 'ON_UPDATE_NOW_FLAG'
undeclared (first use in this function)
/local/qa/5_3.gcov/ext/mysqli/mysqli.c:733: error: (Each undeclared identifier
is reported only once
/local/qa/5_3.gcov/ext/mysqli/mysqli.c:733: error: for each function it appears
in.)
--
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_2) /ext/mysql php_mysql.c
felipe Tue Feb 12 10:24:35 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysql php_mysql.c
Log:
MFB: Fixed Bug #44094 (SEGFAULT when using mysql_connect())
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.20&r2=1.213.2.6.2.21&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.21
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20Sun Jan 20 14:13:11 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 10:24:35 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.20 2008/01/20 14:13:11 bjori Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.21 2008/02/12 10:24:35 felipe Exp $ */
/* TODO:
*
@@ -556,7 +556,7 @@
hashed_details_length = spprintf(&hashed_details, 0,
"mysql__%s_", user);
client_flags = CLIENT_INTERACTIVE;
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!ll", &host_and_port, &host_len,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!bl", &host_and_port, &host_len,
&user,
&user_len, &passwd, &passwd_len,
&new_link, &client_flags)==FAILURE) {
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c
felipe Tue Feb 12 10:15:16 2008 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
Log:
MFB: Fixed Bug #44094 (SEGFAULT when using mysql_connect())
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.249&r2=1.250&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.249 php-src/ext/mysql/php_mysql.c:1.250
--- php-src/ext/mysql/php_mysql.c:1.249 Sun Jan 20 14:10:16 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 10:15:16 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.249 2008/01/20 14:10:16 bjori Exp $ */
+/* $Id: php_mysql.c,v 1.250 2008/02/12 10:15:16 felipe Exp $ */
/* TODO:
*
@@ -643,7 +643,7 @@
user = MySG(default_user);
passwd = MySG(default_password);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s&s&s&ll", &host_and_port, &host_len, UG(utf8_conv),
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s&s&s&bl", &host_and_port, &host_len, UG(utf8_conv),
&user,
&user_len, UG(utf8_conv), &passwd, &passwd_len, UG(utf8_conv),
&new_link, &client_flags)==FAILURE) {
return;
--
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/mysql php_mysql.c
felipe Tue Feb 12 10:11:55 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
Fixed Bug #44094 (SEGFAULT when using mysql_connect())
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.8&r2=1.213.2.6.2.16.2.9&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.8
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.9
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.8Sun Jan 20 14:10:44 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 10:11:55 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.8 2008/01/20 14:10:44 bjori Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.9 2008/02/12 10:11:55 felipe Exp $ */
/* TODO:
*
@@ -643,7 +643,7 @@
hashed_details_length = spprintf(&hashed_details, 0,
"mysql__%s_", user);
client_flags = CLIENT_INTERACTIVE;
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!ll", &host_and_port, &host_len,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!bl", &host_and_port, &host_len,
&user,
&user_len, &passwd, &passwd_len,
&new_link, &client_flags)==FAILURE) {
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c
andrey Tue Feb 12 10:51:25 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
Fix typo
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.118&r2=1.119&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.118 php-src/ext/mysqli/mysqli.c:1.119
--- php-src/ext/mysqli/mysqli.c:1.118 Mon Feb 11 16:45:15 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 10:51:25 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli.c,v 1.118 2008/02/11 16:45:15 andrey Exp $
+ $Id: mysqli.c,v 1.119 2008/02/12 10:51:25 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -726,7 +726,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_BINARY_FLAG", BINARY_FLAG, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_NO_DEFAULT_VALUE_FLAG",
NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT);
-#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 6) ||
(MYSQLI_VERSION_ID > 60003) || defined(HAVE_MYSQLND)
+#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 6) ||
(MYSQL_VERSION_ID > 60003) || defined(HAVE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_ON_UPDATE_NOW_FLAG", ON_UPDATE_NOW_FLAG,
CONST_CS | CONST_PERSISTENT);
#endif
--
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/mysqli mysqli.c
andrey Tue Feb 12 10:51:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
Fix typo
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.12&r2=1.72.2.16.2.17.2.13&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.12
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.13
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.12 Mon Feb 11 16:44:48 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 10:51:39 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.12 2008/02/11 16:44:48 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.13 2008/02/12 10:51:39 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -729,7 +729,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_BINARY_FLAG", BINARY_FLAG, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_NO_DEFAULT_VALUE_FLAG",
NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT);
-#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 6) ||
(MYSQLI_VERSION_ID > 60003) || defined(HAVE_MYSQLND)
+#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 6) ||
(MYSQL_VERSION_ID > 60003) || defined(HAVE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_ON_UPDATE_NOW_FLAG", ON_UPDATE_NOW_FLAG,
CONST_CS | CONST_PERSISTENT);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c
tony2001Tue Feb 12 10:54:27 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
nuke unnecessary TSRMLS_FETCH()
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.119&r2=1.120&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.119 php-src/ext/mysqli/mysqli.c:1.120
--- php-src/ext/mysqli/mysqli.c:1.119 Tue Feb 12 10:51:25 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 10:54:27 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli.c,v 1.119 2008/02/12 10:51:25 andrey Exp $
+ $Id: mysqli.c,v 1.120 2008/02/12 10:54:27 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -75,7 +75,6 @@
void php_mysqli_dtor_p_elements(void *data)
{
MYSQL *mysql = (MYSQL *) data;
- TSRMLS_FETCH();
#if defined(HAVE_MYSQLND)
mysqlnd_end_psession(mysql);
#endif
--
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/mysqli mysqli.c
tony2001Tue Feb 12 10:54:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.13&r2=1.72.2.16.2.17.2.14&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.13
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.14
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.13 Tue Feb 12 10:51:39 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 10:54:54 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.13 2008/02/12 10:51:39 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.14 2008/02/12 10:54:54 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -72,7 +72,6 @@
void php_mysqli_dtor_p_elements(void *data)
{
MYSQL *mysql = (MYSQL *) data;
- TSRMLS_FETCH();
#if defined(HAVE_MYSQLND)
mysqlnd_end_psession(mysql);
#endif
--
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/mysqli mysqli.c
Windows build still seems to be broken: mysqli.c c:\projects\php-5.3\zend\zend_execute.h(229) : warning C4018: '>' : signed/unsigned mismatch ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2065: 'ifdef' : undeclared identifier ext\mysqli\mysqli.c(792) : error C2146: syntax error : missing ')' before identifier 'HAVE_MYSQLND' ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(792) : error C2121: '#' : invalid character : possibly the result of a macro expansion ext\mysqli\mysqli.c(1341) : warning C4018: '>' : signed/unsigned mismatch Looks like VC compiler doesn't like nested macros. -- Stanislav Malyshev, Zend Software Architect [EMAIL PROTECTED] http://www.zend.com/ (408)253-8829 MSN: [EMAIL PROTECTED] -- 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
iliaa Tue Feb 12 18:23:14 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Disable mbstring overload
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.15&r2=1.226.2.37.2.35.2.16&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.15
php-src/run-tests.php:1.226.2.37.2.35.2.16
--- php-src/run-tests.php:1.226.2.37.2.35.2.15 Fri Feb 8 16:46:23 2008
+++ php-src/run-tests.php Tue Feb 12 18:23:14 2008
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.15 2008/02/08 16:46:23 nlopess Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.16 2008/02/12 18:23:14 iliaa 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
@@ -231,6 +231,7 @@
'tidy' => array('tidy.clean_output=0'),
'zlib' => array('zlib.output_compression=Off'),
'xdebug' => array('xdebug.default_enable=0'),
+ 'mbstring' => array('mbstring.func_overload=0'),
);
foreach($info_params_ex as $ext => $ini_overwrites_ex) {
if (in_array($ext, $exts_to_test)) {
@@ -440,7 +441,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.15
$'."\n";
+ echo '$Revision: 1.226.2.37.2.35.2.16
$'."\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_3) /ext/standard/tests/array array_change_key_case_variation7.phpt
bjori Tue Feb 12 20:05:29 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_change_key_case_variation7.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt diff -u php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt:1.1.4.2 php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt:1.1.4.2 Tue Feb 12 17:44:50 2008 +++ php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt Tue Feb 12 20:05:29 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_change_key_case() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- string(3) "xyz" } -Done \ No newline at end of file +Done + -- 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/mysql php_mysql.c
Em Ter, 2008-02-12 às 20:04 +0100, Hannes Magnusson escreveu:
> On Feb 12, 2008 11:24 AM, Felipe Pena <[EMAIL PROTECTED]> wrote:
> > felipe Tue Feb 12 10:24:35 2008 UTC
> >
> > Modified files: (Branch: PHP_5_2)
> > /php-src/ext/mysql php_mysql.c
> > Log:
> > MFB: Fixed Bug #44094 (SEGFAULT when using mysql_connect())
> >
> > http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.20&r2=1.213.2.6.2.21&diff_format=u
> > Index: php-src/ext/mysql/php_mysql.c
> > diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20
> > php-src/ext/mysql/php_mysql.c:1.213.2.6.2.21
> > --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20Sun Jan 20 14:13:11
> > 2008
> > +++ php-src/ext/mysql/php_mysql.c Tue Feb 12 10:24:35 2008
> > @@ -18,7 +18,7 @@
> > +--+
> > */
> >
> > -/* $Id: php_mysql.c,v 1.213.2.6.2.20 2008/01/20 14:13:11 bjori Exp $ */
> > +/* $Id: php_mysql.c,v 1.213.2.6.2.21 2008/02/12 10:24:35 felipe Exp $ */
> >
> > /* TODO:
> > *
> > @@ -556,7 +556,7 @@
> > hashed_details_length = spprintf(&hashed_details, 0,
> > "mysql__%s_", user);
> > client_flags = CLIENT_INTERACTIVE;
> > } else {
> > - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
> > "|s!s!s!ll", &host_and_port, &host_len,
> > + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
> > "|s!s!s!bl", &host_and_port, &host_len,
> >
> > &user, &user_len, &passwd, &passwd_len,
> >
> > &new_link, &client_flags)==FAILURE) {
> > return;
>
> Won't this break the client_flags parameter for mysql_pconnect()?
> (and you seem to have forgotten to add a NEWS entry for this fix)
>
> -Hannes
>
I have not added NEWS entry because on 5_2_4 it works fine.
--
Regards,
Felipe Pena.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c
johannesTue Feb 12 20:43:29 2008 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
Log:
- Make clear what's going on and avoid overwriting parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.250&r2=1.251&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.250 php-src/ext/mysql/php_mysql.c:1.251
--- php-src/ext/mysql/php_mysql.c:1.250 Tue Feb 12 10:15:16 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 20:43:28 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.250 2008/02/12 10:15:16 felipe Exp $ */
+/* $Id: php_mysql.c,v 1.251 2008/02/12 20:43:28 johannes Exp $ */
/* TODO:
*
@@ -642,16 +642,20 @@
host_and_port = MySG(default_host);
user = MySG(default_user);
passwd = MySG(default_password);
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s&s&s&bl", &host_and_port, &host_len, UG(utf8_conv),
+
+ /* mysql_pconnect does not support new_link parameter */
+ if (persistent) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s&s&s&l", &host_and_port, &host_len, UG(utf8_conv),
+ &user,
&user_len, UG(utf8_conv), &passwd, &passwd_len, UG(utf8_conv),
+
&client_flags)==FAILURE) {
+ return;
+ }
+ } else {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s&s&s&bl", &host_and_port, &host_len, UG(utf8_conv),
&user,
&user_len, UG(utf8_conv), &passwd, &passwd_len, UG(utf8_conv),
&new_link, &client_flags)==FAILURE) {
- return;
- }
-
- /* mysql_pconnect does not support new_link parameter */
- if (persistent) {
- client_flags= new_link;
+ return;
+ }
}
/* disable local infile option for open_basedir */
--
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/mysql php_mysql.c
Em Ter, 2008-02-12 às 20:04 +0100, Hannes Magnusson escreveu:
> On Feb 12, 2008 11:24 AM, Felipe Pena <[EMAIL PROTECTED]> wrote:
> > felipe Tue Feb 12 10:24:35 2008 UTC
> >
> > Modified files: (Branch: PHP_5_2)
> > /php-src/ext/mysql php_mysql.c
> > Log:
> > MFB: Fixed Bug #44094 (SEGFAULT when using mysql_connect())
> >
> > http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.20&r2=1.213.2.6.2.21&diff_format=u
> > Index: php-src/ext/mysql/php_mysql.c
> > diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20
> > php-src/ext/mysql/php_mysql.c:1.213.2.6.2.21
> > --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20Sun Jan 20 14:13:11
> > 2008
> > +++ php-src/ext/mysql/php_mysql.c Tue Feb 12 10:24:35 2008
> > @@ -18,7 +18,7 @@
> > +--+
> > */
> >
> > -/* $Id: php_mysql.c,v 1.213.2.6.2.20 2008/01/20 14:13:11 bjori Exp $ */
> > +/* $Id: php_mysql.c,v 1.213.2.6.2.21 2008/02/12 10:24:35 felipe Exp $ */
> >
> > /* TODO:
> > *
> > @@ -556,7 +556,7 @@
> > hashed_details_length = spprintf(&hashed_details, 0,
> > "mysql__%s_", user);
> > client_flags = CLIENT_INTERACTIVE;
> > } else {
> > - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
> > "|s!s!s!ll", &host_and_port, &host_len,
> > + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
> > "|s!s!s!bl", &host_and_port, &host_len,
> >
> > &user, &user_len, &passwd, &passwd_len,
> >
> > &new_link, &client_flags)==FAILURE) {
> > return;
>
> Won't this break the client_flags parameter for mysql_pconnect()?
> (and you seem to have forgotten to add a NEWS entry for this fix)
>
> -Hannes
Ops, i meant 5_2_5. ;)
--
Regards,
Felipe Pena.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/zlib zlib_filter.c
cellog Tue Feb 12 23:29:18 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zlib zlib_filter.c
/php-srcNEWS
Log:
MFH: fix potential memleak due to destruction of filterparams zval
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.6.2.2.2.10&r2=1.6.2.2.2.11&diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.10
php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.11
--- php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.10 Sat Jan 12 22:04:02 2008
+++ php-src/ext/zlib/zlib_filter.c Tue Feb 12 23:29:18 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: zlib_filter.c,v 1.6.2.2.2.10 2008/01/12 22:04:02 cellog Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.2.2.11 2008/02/12 23:29:18 cellog Exp $ */
#include "php.h"
#include "php_zlib.h"
@@ -315,15 +315,17 @@
if ((Z_TYPE_P(filterparams) == IS_ARRAY ||
Z_TYPE_P(filterparams) == IS_OBJECT) &&
zend_hash_find(HASH_OF(filterparams), "window",
sizeof("window"), (void **) &tmpzval) == SUCCESS) {
+ zval tmp;
+
/* log-2 base of history window (9 - 15) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) < -MAX_WBITS ||
Z_LVAL_PP(tmpzval) > MAX_WBITS + 32) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL_PP(tmpzval));
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+ if (Z_LVAL(tmp) < -MAX_WBITS || Z_LVAL(tmp) >
MAX_WBITS + 32) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL(tmp));
} else {
- windowBits = Z_LVAL_PP(tmpzval);
+ windowBits = Z_LVAL(tmp);
}
- zval_ptr_dtor(tmpzval);
}
}
@@ -347,27 +349,33 @@
case IS_ARRAY:
case IS_OBJECT:
if
(zend_hash_find(HASH_OF(filterparams), "memory", sizeof("memory"), (void**)
&tmpzval) == SUCCESS) {
+ zval tmp;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+
/* Memory Level (1 - 9) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) < 1 ||
Z_LVAL_PP(tmpzval) > MAX_MEM_LEVEL) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for memory level. (%ld)",
Z_LVAL_PP(tmpzval));
+ if (Z_LVAL(tmp) < 1 ||
Z_LVAL(tmp) > MAX_MEM_LEVEL) {
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for memory level. (%ld)",
Z_LVAL(tmp));
} else {
- memLevel =
Z_LVAL_PP(tmpzval);
+ memLevel = Z_LVAL(tmp);
}
- zval_ptr_dtor(tmpzval);
}
if
(zend_hash_find(HASH_OF(filterparams), "window", sizeof("window"), (void**)
&tmpzval) == SUCCESS) {
+ zval tmp;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+
/* log-2 base of history window
(9 - 15) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) <
-MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS + 16) {
- php_error_docref(NULL
TSRMLS_CC,
[PHP-CVS] cvs: php-src /ext/zlib zlib_filter.c
cellog Tue Feb 12 23:27:46 2008 UTC
Modified files:
/php-src/ext/zlib zlib_filter.c
Log:
fix potential memleak due to destruction of filterparams zval
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.22 php-src/ext/zlib/zlib_filter.c:1.23
--- php-src/ext/zlib/zlib_filter.c:1.22 Sat Jan 12 22:28:04 2008
+++ php-src/ext/zlib/zlib_filter.c Tue Feb 12 23:27:46 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: zlib_filter.c,v 1.22 2008/01/12 22:28:04 cellog Exp $ */
+/* $Id: zlib_filter.c,v 1.23 2008/02/12 23:27:46 cellog Exp $ */
#include "php.h"
#include "php_zlib.h"
@@ -332,15 +332,17 @@
if ((Z_TYPE_P(filterparams) == IS_ARRAY ||
Z_TYPE_P(filterparams) == IS_OBJECT) &&
zend_hash_find(HASH_OF(filterparams), "window",
sizeof("window"), (void **) &tmpzval) == SUCCESS) {
+ zval tmp;
+
/* log-2 base of history window (9 - 15) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) < -MAX_WBITS ||
Z_LVAL_PP(tmpzval) > MAX_WBITS + 32) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL_PP(tmpzval));
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+ if (Z_LVAL(tmp) < -MAX_WBITS || Z_LVAL(tmp) >
MAX_WBITS + 32) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL(tmp));
} else {
- windowBits = Z_LVAL_PP(tmpzval);
+ windowBits = Z_LVAL(tmp);
}
- zval_ptr_dtor(tmpzval);
}
}
@@ -364,27 +366,33 @@
case IS_ARRAY:
case IS_OBJECT:
if
(zend_hash_find(HASH_OF(filterparams), "memory", sizeof("memory"), (void**)
&tmpzval) == SUCCESS) {
+ zval tmp;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+
/* Memory Level (1 - 9) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) < 1 ||
Z_LVAL_PP(tmpzval) > MAX_MEM_LEVEL) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for memory level. (%ld)",
Z_LVAL_PP(tmpzval));
+ if (Z_LVAL(tmp) < 1 ||
Z_LVAL(tmp) > MAX_MEM_LEVEL) {
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for memory level. (%ld)",
Z_LVAL(tmp));
} else {
- memLevel =
Z_LVAL_PP(tmpzval);
+ memLevel = Z_LVAL(tmp);
}
- zval_ptr_dtor(tmpzval);
}
if
(zend_hash_find(HASH_OF(filterparams), "window", sizeof("window"), (void**)
&tmpzval) == SUCCESS) {
+ zval tmp;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+
/* log-2 base of history window
(9 - 15) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) <
-MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS + 16) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for window size. (%ld)",
Z_LVAL_PP(tmpzval));
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli.c
andrey Tue Feb 12 22:05:34 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
Fix windows build - VC doesn't like nested macros
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.15&r2=1.72.2.16.2.17.2.16&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.15
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.16
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.15 Tue Feb 12 20:19:21 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 22:05:34 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.15 2008/02/12 20:19:21 johannes Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.16 2008/02/12 22:05:34 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -781,17 +781,16 @@
REGISTER_LONG_CONSTANT("MYSQLI_REPORT_ALL", MYSQLI_REPORT_ALL, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_REPORT_OFF", 0, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED",
+ /* We use non-nested macros with expansion, as VC has problems */
#ifdef HAVE_MYSQLND
- MYSQLND_DBG_ENABLED
+ REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED",
MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT);
#else
#ifndef DBUG_OFF
- 0
+ REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 0, CONST_CS |
CONST_PERSISTENT);
#else
- 1
+ REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 1, CONST_CS |
CONST_PERSISTENT);
#endif
#endif
- , CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
--
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/mysql php_mysql.c
johannesTue Feb 12 20:43:50 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysql php_mysql.c
Log:
- MFH: Make clear what's going on and avoid overwriting parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.21&r2=1.213.2.6.2.22&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.21
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.22
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.21Tue Feb 12 10:24:35 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 20:43:50 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.21 2008/02/12 10:24:35 felipe Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.22 2008/02/12 20:43:50 johannes Exp $ */
/* TODO:
*
@@ -556,10 +556,19 @@
hashed_details_length = spprintf(&hashed_details, 0,
"mysql__%s_", user);
client_flags = CLIENT_INTERACTIVE;
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!bl", &host_and_port, &host_len,
- &user,
&user_len, &passwd, &passwd_len,
-
&new_link, &client_flags)==FAILURE) {
- return;
+ /* mysql_pconnect does not support new_link parameter */
+ if (persistent) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!l", &host_and_port, &host_len,
+ &user,
&user_len, &passwd, &passwd_len,
+
&client_flags)==FAILURE) {
+ return;
+ }
+ } else {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!bl", &host_and_port, &host_len,
+
&user, &user_len, &passwd, &passwd_len,
+
&new_link, &client_flags)==FAILURE) {
+ return;
+ }
}
if (!host_and_port) {
@@ -572,11 +581,6 @@
passwd = MySG(default_password);
}
- /* mysql_pconnect does not support new_link parameter */
- if (persistent) {
- client_flags= new_link;
- }
-
/* disable local infile option for open_basedir */
if (((PG(open_basedir) && PG(open_basedir)[0] != '\0') ||
PG(safe_mode)) && (client_flags & CLIENT_LOCAL_FILES)) {
client_flags ^= CLIENT_LOCAL_FILES;
--
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/mysql php_mysql.c
johannesTue Feb 12 20:43:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
- MFH: Make clear what's going on and avoid overwriting parameters
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.9&r2=1.213.2.6.2.16.2.10&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.9
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.10
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.9Tue Feb 12 10:11:55 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 20:43:42 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.9 2008/02/12 10:11:55 felipe Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.10 2008/02/12 20:43:42 johannes Exp $ */
/* TODO:
*
@@ -643,10 +643,19 @@
hashed_details_length = spprintf(&hashed_details, 0,
"mysql__%s_", user);
client_flags = CLIENT_INTERACTIVE;
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!bl", &host_and_port, &host_len,
- &user,
&user_len, &passwd, &passwd_len,
-
&new_link, &client_flags)==FAILURE) {
- return;
+ /* mysql_pconnect does not support new_link parameter */
+ if (persistent) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!l", &host_and_port, &host_len,
+ &user,
&user_len, &passwd, &passwd_len,
+
&client_flags)==FAILURE) {
+ return;
+ }
+ } else {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"|s!s!s!bl", &host_and_port, &host_len,
+
&user, &user_len, &passwd, &passwd_len,
+
&new_link, &client_flags)==FAILURE) {
+ return;
+ }
}
if (!host_and_port) {
@@ -659,11 +668,6 @@
passwd = MySG(default_password);
}
- /* mysql_pconnect does not support new_link parameter */
- if (persistent) {
- client_flags= new_link;
- }
-
/* disable local infile option for open_basedir */
if (((PG(open_basedir) && PG(open_basedir)[0] != '\0') ||
PG(safe_mode)) && (client_flags & CLIENT_LOCAL_FILES)) {
client_flags ^= CLIENT_LOCAL_FILES;
--
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/mysqli mysqli.c
johannesTue Feb 12 20:19:21 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli.c
Log:
MFH: - Fix build with TSRM and mysqlnd
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.14&r2=1.72.2.16.2.17.2.15&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.14
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.15
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.14 Tue Feb 12 10:54:54 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 20:19:21 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]>|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.14 2008/02/12 10:54:54 tony2001 Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.15 2008/02/12 20:19:21 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -73,6 +73,8 @@
{
MYSQL *mysql = (MYSQL *) data;
#if defined(HAVE_MYSQLND)
+ TSRMLS_FETCH();
+
mysqlnd_end_psession(mysql);
#endif
mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c
johannesTue Feb 12 20:18:56 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
- Fix build with TSRM and mysqlnd
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.120&r2=1.121&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.120 php-src/ext/mysqli/mysqli.c:1.121
--- php-src/ext/mysqli/mysqli.c:1.120 Tue Feb 12 10:54:27 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 20:18:56 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli.c,v 1.120 2008/02/12 10:54:27 tony2001 Exp $
+ $Id: mysqli.c,v 1.121 2008/02/12 20:18:56 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -76,6 +76,8 @@
{
MYSQL *mysql = (MYSQL *) data;
#if defined(HAVE_MYSQLND)
+ TSRMLS_FETCH();
+
mysqlnd_end_psession(mysql);
#endif
mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT);
--
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/standard/tests/array array_change_key_case_variation7.phpt
bjori Tue Feb 12 20:06:10 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array array_change_key_case_variation7.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt diff -u php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt:1.1.2.1 php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt:1.1.2.2 --- php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt:1.1.2.1 Tue Feb 12 17:43:53 2008 +++ php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt Tue Feb 12 20:06:10 2008 @@ -1,5 +1,7 @@ --TEST-- Test array_change_key_case() function : usage variations - referenced variables +--INI-- +allow_call_time_pass_reference=on --FILE-- string(3) "xyz" } -Done \ No newline at end of file +Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_2) /ext/mysql php_mysql.c
On 2008-02-12 20:04, Hannes Magnusson wrote:
On Feb 12, 2008 11:24 AM, Felipe Pena <[EMAIL PROTECTED]> wrote:
felipe Tue Feb 12 10:24:35 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysql php_mysql.c
Log:
MFB: Fixed Bug #44094 (SEGFAULT when using mysql_connect())
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.20&r2=1.213.2.6.2.21&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.21
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20Sun Jan 20 14:13:11 2008
+++ php-src/ext/mysql/php_mysql.c Tue Feb 12 10:24:35 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.20 2008/01/20 14:13:11 bjori Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.21 2008/02/12 10:24:35 felipe Exp $ */
/* TODO:
*
@@ -556,7 +556,7 @@
hashed_details_length = spprintf(&hashed_details, 0,
"mysql__%s_", user);
client_flags = CLIENT_INTERACTIVE;
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!ll",
&host_and_port, &host_len,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!s!bl",
&host_and_port, &host_len,
&user,
&user_len, &passwd, &passwd_len,
&new_link,
&client_flags)==FAILURE) {
return;
Won't this break the client_flags parameter for mysql_pconnect()?
Beyond my knowledge, but I really hope it doesn't.
(and you seem to have forgotten to add a NEWS entry for this fix)
I don't think it's appropriate. 5.2.5 did not have this problem, only
snapshots were affected.
I'm suspecting this commit might have broken it (but I haven't verified):
iliaa Thu Dec 20 00:31:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mysql php_mysql.c
/php-srcNEWS
Log:
MFB: Fixed bug #43635 (mysql extension ingores INI settings on NULL
values
passed to mysql_connect())
-
--
Christian Hoffmann
signature.asc
Description: OpenPGP digital signature
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/mysql php_mysql.c
On Feb 12, 2008 11:24 AM, Felipe Pena <[EMAIL PROTECTED]> wrote:
> felipe Tue Feb 12 10:24:35 2008 UTC
>
> Modified files: (Branch: PHP_5_2)
> /php-src/ext/mysql php_mysql.c
> Log:
> MFB: Fixed Bug #44094 (SEGFAULT when using mysql_connect())
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.20&r2=1.213.2.6.2.21&diff_format=u
> Index: php-src/ext/mysql/php_mysql.c
> diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20
> php-src/ext/mysql/php_mysql.c:1.213.2.6.2.21
> --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.20Sun Jan 20 14:13:11
> 2008
> +++ php-src/ext/mysql/php_mysql.c Tue Feb 12 10:24:35 2008
> @@ -18,7 +18,7 @@
> +--+
> */
>
> -/* $Id: php_mysql.c,v 1.213.2.6.2.20 2008/01/20 14:13:11 bjori Exp $ */
> +/* $Id: php_mysql.c,v 1.213.2.6.2.21 2008/02/12 10:24:35 felipe Exp $ */
>
> /* TODO:
> *
> @@ -556,7 +556,7 @@
> hashed_details_length = spprintf(&hashed_details, 0,
> "mysql__%s_", user);
> client_flags = CLIENT_INTERACTIVE;
> } else {
> - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
> "|s!s!s!ll", &host_and_port, &host_len,
> + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
> "|s!s!s!bl", &host_and_port, &host_len,
>
> &user, &user_len, &passwd, &passwd_len,
>
> &new_link, &client_flags)==FAILURE) {
> return;
Won't this break the client_flags parameter for mysql_pconnect()?
(and you seem to have forgotten to add a NEWS entry for this fix)
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zlib zlib_filter.c
cellog Tue Feb 12 23:28:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zlib zlib_filter.c
Log:
MFH: fix potential memleak due to destruction of filterparams zval
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_filter.c?r1=1.6.2.2.2.4.2.6&r2=1.6.2.2.2.4.2.7&diff_format=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.6
php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.7
--- php-src/ext/zlib/zlib_filter.c:1.6.2.2.2.4.2.6 Sat Jan 12 22:03:32 2008
+++ php-src/ext/zlib/zlib_filter.c Tue Feb 12 23:28:05 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.6 2008/01/12 22:03:32 cellog Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.2.2.4.2.7 2008/02/12 23:28:05 cellog Exp $ */
#include "php.h"
#include "php_zlib.h"
@@ -314,15 +314,17 @@
if ((Z_TYPE_P(filterparams) == IS_ARRAY ||
Z_TYPE_P(filterparams) == IS_OBJECT) &&
zend_hash_find(HASH_OF(filterparams), "window",
sizeof("window"), (void **) &tmpzval) == SUCCESS) {
+ zval tmp;
+
/* log-2 base of history window (9 - 15) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) < -MAX_WBITS ||
Z_LVAL_PP(tmpzval) > MAX_WBITS + 32) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL_PP(tmpzval));
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+ if (Z_LVAL(tmp) < -MAX_WBITS || Z_LVAL(tmp) >
MAX_WBITS + 32) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Invalid parameter give for window size. (%ld)", Z_LVAL(tmp));
} else {
- windowBits = Z_LVAL_PP(tmpzval);
+ windowBits = Z_LVAL(tmp);
}
- zval_ptr_dtor(tmpzval);
}
}
@@ -346,27 +348,33 @@
case IS_ARRAY:
case IS_OBJECT:
if
(zend_hash_find(HASH_OF(filterparams), "memory", sizeof("memory"), (void**)
&tmpzval) == SUCCESS) {
+ zval tmp;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+
/* Memory Level (1 - 9) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) < 1 ||
Z_LVAL_PP(tmpzval) > MAX_MEM_LEVEL) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for memory level. (%ld)",
Z_LVAL_PP(tmpzval));
+ if (Z_LVAL(tmp) < 1 ||
Z_LVAL(tmp) > MAX_MEM_LEVEL) {
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Invalid parameter give for memory level. (%ld)",
Z_LVAL(tmp));
} else {
- memLevel =
Z_LVAL_PP(tmpzval);
+ memLevel = Z_LVAL(tmp);
}
- zval_ptr_dtor(tmpzval);
}
if
(zend_hash_find(HASH_OF(filterparams), "window", sizeof("window"), (void**)
&tmpzval) == SUCCESS) {
+ zval tmp;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(&tmp);
+ convert_to_long(&tmp);
+
/* log-2 base of history window
(9 - 15) */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) <
-MAX_WBITS || Z_LVAL_PP(tmpzval) > MAX_WBITS + 16) {
- php_error_docref(NULL
TSRMLS
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_change_key_case_variation1.phpt array_change_key_case_variation2.phpt array_change_key_case_variation3.phpt array_change_key_case_variation4.phpt
jmessa Tue Feb 12 17:45:48 2008 UTC
Modified files:
/php-src/ext/standard/tests/array
array_change_key_case_variation4.phpt
array_change_key_case_variation7.phpt
array_change_key_case_variation8.phpt
array_change_key_case_variation3.phpt
array_change_key_case_variation1.phpt
array_change_key_case_variation2.phpt
array_change_key_case_variation5.phpt
array_change_key_case_variation6.phpt
Log:
- committing array_change_key_case variation tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt
diff -u /dev/null
php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt:1.2
--- /dev/null Tue Feb 12 17:45:48 2008
+++ php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt
Tue Feb 12 17:45:47 2008
@@ -0,0 +1,251 @@
+--TEST--
+Test array_change_key_case() function : usage variations - different int
values for $case
+--FILE--
+ 'un', 'TWO' => 'deux', 'three' => 'trois');
+for ($i = -5; $i <=5; $i += 1){
+ echo "\n-- \$sort argument is $i --\n";
+ $temp = $input;
+ var_dump(array_change_key_case($temp, $i));
+}
+
+echo "Done";
+?>
+
+--EXPECTF--
+*** Testing array_change_key_case() : usage variations ***
+
+-- $sort argument is -5 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is -4 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is -3 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is -2 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is -1 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is 0 --
+array(3) {
+ ["one"]=>
+ string(2) "un"
+ ["two"]=>
+ string(4) "deux"
+ ["three"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is 1 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is 2 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is 3 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is 4 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+
+-- $sort argument is 5 --
+array(3) {
+ ["ONE"]=>
+ string(2) "un"
+ ["TWO"]=>
+ string(4) "deux"
+ ["THREE"]=>
+ string(5) "trois"
+}
+Done
+--UEXPECTF--
+*** Testing array_change_key_case() : usage variations ***
+
+-- $sort argument is -5 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is -4 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is -3 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is -2 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is -1 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is 0 --
+array(3) {
+ [u"one"]=>
+ unicode(2) "un"
+ [u"two"]=>
+ unicode(4) "deux"
+ [u"three"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is 1 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is 2 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is 3 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is 4 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unicode(5) "trois"
+}
+
+-- $sort argument is 5 --
+array(3) {
+ [u"ONE"]=>
+ unicode(2) "un"
+ [u"TWO"]=>
+ unicode(4) "deux"
+ [u"THREE"]=>
+ unico
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array array_change_key_case_variation1.phpt array_change_key_case_variation2.phpt array_change_key_case_variation3.phpt array_change_key_case_variat
jmessa Tue Feb 12 17:43:54 2008 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array array_change_key_case_variation1.phpt array_change_key_case_variation5.phpt array_change_key_case_variation3.phpt array_change_key_case_variation2.phpt array_change_key_case_variation7.phpt array_change_key_case_variation6.phpt array_change_key_case_variation4.phpt array_change_key_case_variation8.phpt Log: - committing array_change_key_case variation tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation1.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation5.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation3.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation2.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation6.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation8.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation8.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 array_change_key_case_variation1.phpt array_change_key_case_variation2.phpt array_change_key_case_variation3.phpt array_change_key_case_variat
jmessa Tue Feb 12 17:44:50 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_change_key_case_variation6.phpt array_change_key_case_variation4.phpt array_change_key_case_variation1.phpt array_change_key_case_variation7.phpt array_change_key_case_variation2.phpt array_change_key_case_variation5.phpt array_change_key_case_variation8.phpt array_change_key_case_variation3.phpt Log: - committing array_change_key_case variation tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation6.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation1.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation2.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation5.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation5.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation8.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_change_key_case_variation3.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/array/array_change_key_case_variation3.phpt +++ php-src/ext/standard/tests/array/array_change_key_case_variation3.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli.c
andrey Tue Feb 12 22:06:06 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli.c
Log:
Fix Windows build. VC doesn't like nested macros - expansion + #if
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.121&r2=1.122&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.121 php-src/ext/mysqli/mysqli.c:1.122
--- php-src/ext/mysqli/mysqli.c:1.121 Tue Feb 12 20:18:56 2008
+++ php-src/ext/mysqli/mysqli.c Tue Feb 12 22:06:06 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli.c,v 1.121 2008/02/12 20:18:56 johannes Exp $
+ $Id: mysqli.c,v 1.122 2008/02/12 22:06:06 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -778,17 +778,16 @@
REGISTER_LONG_CONSTANT("MYSQLI_REPORT_ALL", MYSQLI_REPORT_ALL, CONST_CS
| CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_REPORT_OFF", 0, CONST_CS |
CONST_PERSISTENT);
- REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED",
+ /* We use non-nested macros with expansion, as VC has problems */
#ifdef HAVE_MYSQLND
- MYSQLND_DBG_ENABLED
+ REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED",
MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT);
#else
#ifndef DBUG_OFF
- 0
+ REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 0, CONST_CS |
CONST_PERSISTENT);
#else
- 1
+ REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED", 1, CONST_CS |
CONST_PERSISTENT);
#endif
#endif
- , CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
--
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/mysql php_mysql.c
Hi,
On Tue, 2008-02-12 at 20:04 +0100, "Hannes Magnusson" wrote:
> > @@ -556,7 +556,7 @@
> > hashed_details_length = spprintf(&hashed_details, 0,
> > "mysql__%s_", user);
> > client_flags = CLIENT_INTERACTIVE;
> > } else {
> > - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
> > "|s!s!s!ll", &host_and_port, &host_len,
> > + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
> > "|s!s!s!bl", &host_and_port, &host_len,
> >
> > &user, &user_len, &passwd, &passwd_len,
> >
> > &new_link, &client_flags)==FAILURE) {
> > return;
>
> Won't this break the client_flags parameter for mysql_pconnect()?
I've just committed a fix which should make the code better readable in
this place to avoid similar problems in the future.
johannes
--
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/standard array.c
Em Ter, 2008-02-12 às 18:50 +0100, Hannes Magnusson escreveu: > On Feb 12, 2008 2:31 AM, Felipe Pena <[EMAIL PROTECTED]> wrote: > > felipe Tue Feb 12 01:31:12 2008 UTC > > > > Modified files: (Branch: PHP_5_3) > > /php-src/ext/standard array.c > > Log: > > array_slice() - Fixed behavior when NULL is given in third parameter (BC) > > This is starting to be pretty damn funny. > AFAICS this is the 4th attempt (in 3weeks) to fix the exact same bug, > doesn't anyone have a test case specifcally for this bug? > I know there are bunch of array_splice_*.phpt tests, but this bug > really deserves its own test case. > > -Hannes > Yesterday I added a test case for this bug. -- 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/standard array.c
On Feb 12, 2008 2:31 AM, Felipe Pena <[EMAIL PROTECTED]> wrote: > felipe Tue Feb 12 01:31:12 2008 UTC > > Modified files: (Branch: PHP_5_3) > /php-src/ext/standard array.c > Log: > array_slice() - Fixed behavior when NULL is given in third parameter (BC) This is starting to be pretty damn funny. AFAICS this is the 4th attempt (in 3weeks) to fix the exact same bug, doesn't anyone have a test case specifcally for this bug? I know there are bunch of array_splice_*.phpt tests, but this bug really deserves its own test case. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c /ext/standard/tests/math exp_error.phpt
@@ -471,14 +471,14 @@
Returns e raised to the power of the number */
PHP_FUNCTION(exp)
{
- zval **num;
+double num;
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num)
== FAILURE) {
+return;
+}
+
+RETURN_DOUBLE(exp(num));
you have spaces there instead of tabs.
Nuno
--
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/standard array.c
felipe Tue Feb 12 12:47:30 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c
Log:
MFB: array_slice() - Fixed behavior when NULL is given in third parameter (BC)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.49&r2=1.308.2.21.2.50&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.49
php-src/ext/standard/array.c:1.308.2.21.2.50
--- php-src/ext/standard/array.c:1.308.2.21.2.49Tue Feb 5 16:01:21 2008
+++ php-src/ext/standard/array.cTue Feb 12 12:47:30 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.49 2008/02/05 16:01:21 iliaa Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.50 2008/02/12 12:47:30 felipe Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2202,9 +2202,10 @@
PHP_FUNCTION(array_slice)
{
zval *input,/* Input array */
+ **z_length, /* How many elements to get */
**entry;/* An array entry */
long offset,/* Offset to get elements from */
-length = NULL; /* How many elements to get */
+length = 0;
zend_bool preserve_keys = 0; /* Whether to preserve keys while copying
to the new array or not */
int num_in,/* Number of elements in the
input array */
pos; /* Current position in the
array */
@@ -2213,7 +2214,7 @@
ulong num_key;
HashPosition hpos;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "al|lb", &input,
&offset, &length, &preserve_keys) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "al|Zb", &input,
&offset, &z_length, &preserve_keys) == FAILURE) {
return;
}
@@ -2221,8 +,11 @@
num_in = zend_hash_num_elements(Z_ARRVAL_P(input));
/* We want all entries from offset to the end if length is not passed
or is null */
- if (length == NULL) {
+ if (ZEND_NUM_ARGS() < 3 || Z_TYPE_PP(z_length) == IS_NULL) {
length = num_in;
+ } else {
+ convert_to_long_ex(z_length);
+ length = Z_LVAL_PP(z_length);
}
/* Initialize returned array */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
