Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/ming ming.c php_ming.h
Hi Derick, I'm working on optimizing the version checking to make it possible to compile and link against at least 0.3, but older versions might not be possible as it would create too much spaghetti code. - Frank > On Fri, 25 Jul 2008, Derick Rethans wrote: > > > On Thu, 24 Jul 2008, Frank M. Kromann wrote: > > > > > fmk Thu Jul 24 08:02:39 2008 UTC > > > > > > Modified files: (Branch: PHP_5_3) > > > /php-src/ext/ming ming.c php_ming.h > > > Log: > > > Syncronize the ming extension with libming 0.4 > > > [DOC] PHP 5.3 requires libming 0.4 > > > > Is that really necessary? libming 0.3 has been working fine, and it's > > the latest that debian unstable has - could you please see if it'd be > > possible to support that as well? > > This is even more useful as PHP < 5.3 doesn't compile against libming > 0.4. In order to be able to run both 5.2 and 5.3 I need both version of > the lib - something that many distributions don't do. > > regards, > Derick > -- > HEAD before 5_3!: http://tinyurl.com/6d2esb > http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org > -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/fileinfo fileinfo.c
Em Sex, 2008-07-25 às 18:18 +0200, Derick Rethans escreveu: > On Fri, 25 Jul 2008, Felipe Pena wrote: > > > felipe Fri Jul 25 15:20:58 2008 UTC > > > > Modified files: > > /php-src/ext/fileinfo fileinfo.c > > Log: > > - Added arginfo > > - Fixed: > > . proto: finfo_buffer > > . parameter type in _php_finfo_get_type() > > Please keep PHP_5_3 and HEAD in sync > Hm!? I commited in both. -- Regards, Felipe Pena. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/fileinfo fileinfo.c
On Fri, 25 Jul 2008, Felipe Pena wrote: > felipeFri Jul 25 15:20:58 2008 UTC > > Modified files: > /php-src/ext/fileinfo fileinfo.c > Log: > - Added arginfo > - Fixed: > . proto: finfo_buffer > . parameter type in _php_finfo_get_type() Please keep PHP_5_3 and HEAD in sync regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- 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/fileinfo fileinfo.c
felipe Fri Jul 25 15:23:10 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/fileinfo fileinfo.c
Log:
MFH:
- Added arginfo
- Fixed:
. proto: finfo_buffer
. parameter type in _php_finfo_get_type()
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.20.2.1&r2=1.20.2.2&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.20.2.1
php-src/ext/fileinfo/fileinfo.c:1.20.2.2
--- php-src/ext/fileinfo/fileinfo.c:1.20.2.1Fri Jul 25 09:16:22 2008
+++ php-src/ext/fileinfo/fileinfo.c Fri Jul 25 15:23:10 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fileinfo.c,v 1.20.2.1 2008/07/25 09:16:22 jani Exp $ */
+/* $Id: fileinfo.c,v 1.20.2.2 2008/07/25 15:23:10 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -114,19 +114,73 @@
}
/* }}} */
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_open, 0, 0, 0)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_close, 0, 0, 1)
+ ZEND_ARG_INFO(0, finfo)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_set_flags, 0, 0, 2)
+ ZEND_ARG_INFO(0, finfo)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_set_flags, 0, 0, 1)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_file, 0, 0, 2)
+ ZEND_ARG_INFO(0, finfo)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_file, 0, 0, 1)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_buffer, 0, 0, 2)
+ ZEND_ARG_INFO(0, finfo)
+ ZEND_ARG_INFO(0, string)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_buffer, 0, 0, 1)
+ ZEND_ARG_INFO(0, string)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+/* }}} */
+
/* {{{ finfo_class_functions
*/
function_entry finfo_class_functions[] = {
#if PHP_VERSION_ID >= 50200
- ZEND_ME_MAPPING(finfo, finfo_open, NULL, ZEND_ACC_PUBLIC)
- ZEND_ME_MAPPING(set_flags, finfo_set_flags,NULL, ZEND_ACC_PUBLIC)
- ZEND_ME_MAPPING(file, finfo_file, NULL, ZEND_ACC_PUBLIC)
- ZEND_ME_MAPPING(buffer, finfo_buffer, NULL, ZEND_ACC_PUBLIC)
+ ZEND_ME_MAPPING(finfo, finfo_open, arginfo_finfo_open,
ZEND_ACC_PUBLIC)
+ ZEND_ME_MAPPING(set_flags,
finfo_set_flags,arginfo_finfo_method_set_flags, ZEND_ACC_PUBLIC)
+ ZEND_ME_MAPPING(file, finfo_file,
arginfo_finfo_method_file, ZEND_ACC_PUBLIC)
+ ZEND_ME_MAPPING(buffer, finfo_buffer,
arginfo_finfo_method_buffer, ZEND_ACC_PUBLIC)
#else
- ZEND_ME_MAPPING(finfo, finfo_open, NULL)
- ZEND_ME_MAPPING(set_flags, finfo_set_flags,NULL)
- ZEND_ME_MAPPING(file, finfo_file, NULL)
- ZEND_ME_MAPPING(buffer, finfo_buffer, NULL)
+ ZEND_ME_MAPPING(finfo, finfo_open, arginfo_finfo_open)
+ ZEND_ME_MAPPING(set_flags,
finfo_set_flags,arginfo_finfo_method_set_flags)
+ ZEND_ME_MAPPING(file, finfo_file,
arginfo_finfo_method_file)
+ ZEND_ME_MAPPING(buffer, finfo_buffer,
arginfo_finfo_method_buffer)
#endif
{NULL, NULL, NULL}
};
@@ -166,14 +220,15 @@
}
/* }}} */
+
/* {{{ fileinfo_functions[]
*/
function_entry fileinfo_functions[] = {
- PHP_FE(finfo_open, NULL)
- PHP_FE(finfo_close, NULL)
- PHP_FE(finfo_set_flags, NULL)
- PHP_FE(finfo_file, NULL)
- PHP_FE(finfo_buffer,NULL)
+ PHP_FE(finfo_open, arginfo_finfo_open)
+ PHP_FE(finfo_close, arginfo_finfo_close)
+ PHP_FE(finfo_set_flags, arginfo_finfo_set_flags)
+ PHP_FE(finfo_file, arginfo_finfo_file)
+ PHP_FE(finfo_buffer,arginfo_finfo_buffer)
{NULL, NULL, NULL}
};
/* }}} */
@@ -354,12 +409,12 @@
FILEINFO_DECLARE_INIT_OBJECT(object)
if (object) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lbr",
&buffer, &buffer_len, &options, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lr",
&buffer, &buffer_len, &options, &zcontext) == FAILURE) {
RETURN_FALSE;
}
FILEINFO_FROM_OBJECT(finfo, object);
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_C
[PHP-CVS] cvs: php-src /ext/fileinfo fileinfo.c
felipe Fri Jul 25 15:20:58 2008 UTC
Modified files:
/php-src/ext/fileinfo fileinfo.c
Log:
- Added arginfo
- Fixed:
. proto: finfo_buffer
. parameter type in _php_finfo_get_type()
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.22
php-src/ext/fileinfo/fileinfo.c:1.23
--- php-src/ext/fileinfo/fileinfo.c:1.22Fri Jul 25 11:54:06 2008
+++ php-src/ext/fileinfo/fileinfo.c Fri Jul 25 15:20:58 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fileinfo.c,v 1.22 2008/07/25 11:54:06 felipe Exp $ */
+/* $Id: fileinfo.c,v 1.23 2008/07/25 15:20:58 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -114,19 +114,73 @@
}
/* }}} */
+/* {{{ arginfo */
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_open, 0, 0, 0)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, arg)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_close, 0, 0, 1)
+ ZEND_ARG_INFO(0, finfo)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_set_flags, 0, 0, 2)
+ ZEND_ARG_INFO(0, finfo)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_set_flags, 0, 0, 1)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_file, 0, 0, 2)
+ ZEND_ARG_INFO(0, finfo)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_file, 0, 0, 1)
+ ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_buffer, 0, 0, 2)
+ ZEND_ARG_INFO(0, finfo)
+ ZEND_ARG_INFO(0, string)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+
+static
+ZEND_BEGIN_ARG_INFO_EX(arginfo_finfo_method_buffer, 0, 0, 1)
+ ZEND_ARG_INFO(0, string)
+ ZEND_ARG_INFO(0, options)
+ ZEND_ARG_INFO(0, context)
+ZEND_END_ARG_INFO()
+/* }}} */
+
/* {{{ finfo_class_functions
*/
function_entry finfo_class_functions[] = {
#if PHP_VERSION_ID >= 50200
- ZEND_ME_MAPPING(finfo, finfo_open, NULL, ZEND_ACC_PUBLIC)
- ZEND_ME_MAPPING(set_flags, finfo_set_flags,NULL, ZEND_ACC_PUBLIC)
- ZEND_ME_MAPPING(file, finfo_file, NULL, ZEND_ACC_PUBLIC)
- ZEND_ME_MAPPING(buffer, finfo_buffer, NULL, ZEND_ACC_PUBLIC)
+ ZEND_ME_MAPPING(finfo, finfo_open, arginfo_finfo_open,
ZEND_ACC_PUBLIC)
+ ZEND_ME_MAPPING(set_flags,
finfo_set_flags,arginfo_finfo_method_set_flags, ZEND_ACC_PUBLIC)
+ ZEND_ME_MAPPING(file, finfo_file,
arginfo_finfo_method_file, ZEND_ACC_PUBLIC)
+ ZEND_ME_MAPPING(buffer, finfo_buffer,
arginfo_finfo_method_buffer, ZEND_ACC_PUBLIC)
#else
- ZEND_ME_MAPPING(finfo, finfo_open, NULL)
- ZEND_ME_MAPPING(set_flags, finfo_set_flags,NULL)
- ZEND_ME_MAPPING(file, finfo_file, NULL)
- ZEND_ME_MAPPING(buffer, finfo_buffer, NULL)
+ ZEND_ME_MAPPING(finfo, finfo_open, arginfo_finfo_open)
+ ZEND_ME_MAPPING(set_flags,
finfo_set_flags,arginfo_finfo_method_set_flags)
+ ZEND_ME_MAPPING(file, finfo_file,
arginfo_finfo_method_file)
+ ZEND_ME_MAPPING(buffer, finfo_buffer,
arginfo_finfo_method_buffer)
#endif
{NULL, NULL, NULL}
};
@@ -166,14 +220,15 @@
}
/* }}} */
+
/* {{{ fileinfo_functions[]
*/
function_entry fileinfo_functions[] = {
- PHP_FE(finfo_open, NULL)
- PHP_FE(finfo_close, NULL)
- PHP_FE(finfo_set_flags, NULL)
- PHP_FE(finfo_file, NULL)
- PHP_FE(finfo_buffer,NULL)
+ PHP_FE(finfo_open, arginfo_finfo_open)
+ PHP_FE(finfo_close, arginfo_finfo_close)
+ PHP_FE(finfo_set_flags, arginfo_finfo_set_flags)
+ PHP_FE(finfo_file, arginfo_finfo_file)
+ PHP_FE(finfo_buffer,arginfo_finfo_buffer)
{NULL, NULL, NULL}
};
/* }}} */
@@ -354,12 +409,12 @@
FILEINFO_DECLARE_INIT_OBJECT(object)
if (object) {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lbr",
&buffer, &buffer_len, &options, &zcontext) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lr",
&buffer, &buffer_len, &options, &zcontext) == FAILURE) {
RETURN_FALSE;
}
FILEINFO_FROM_OBJECT(finfo, object);
} else {
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|lbr",
&zfinfo, &buffer, &buffer_len, &
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cli php_cli.c
tony2001Fri Jul 25 15:05:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cli php_cli.c
Log:
fix warnings
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.11&r2=1.129.2.13.2.22.2.12&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.11
php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.12
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.11 Thu Jul 24 09:12:45 2008
+++ php-src/sapi/cli/php_cli.c Fri Jul 25 15:05:48 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.11 2008/07/24 09:12:45 lbarnaud Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.22.2.12 2008/07/25 15:05:48 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -292,7 +292,7 @@
static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) /*
{{{ */
{
- size_t len;
+ unsigned int len;
char *docroot = "";
/* In CGI mode, we consider the environment to be a part of the server
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cli php_cli.c
tony2001Fri Jul 25 15:05:33 2008 UTC
Modified files:
/php-src/sapi/cli php_cli.c
Log:
fix warnings
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.192&r2=1.193&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.192 php-src/sapi/cli/php_cli.c:1.193
--- php-src/sapi/cli/php_cli.c:1.192Thu Jul 24 09:11:48 2008
+++ php-src/sapi/cli/php_cli.c Fri Jul 25 15:05:33 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.192 2008/07/24 09:11:48 lbarnaud Exp $ */
+/* $Id: php_cli.c,v 1.193 2008/07/25 15:05:33 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -296,7 +296,7 @@
static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) /*
{{{ */
{
- size_t len;
+ unsigned int len;
char *docroot = "";
/* In CGI mode, we consider the environment to be a part of the server
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c php_mbregex.c
moriyoshi Fri Jul 25 14:04:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c php_mbregex.c
Log:
- MFH: Fix warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.24&r2=1.224.2.22.2.25.2.25&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.24
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.25
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.24Fri Jul 25
13:57:23 2008
+++ php-src/ext/mbstring/mbstring.c Fri Jul 25 14:04:54 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.24 2008/07/25 13:57:23 moriyoshi Exp $
*/
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.25 2008/07/25 14:04:54 moriyoshi Exp $
*/
/*
* PHP 4 Multibyte String module "mbstring"
@@ -2425,7 +2425,7 @@
RETURN_FALSE;
}
- if (offset > haystack.len) {
+ if ((unsigned int)offset > haystack.len) {
RETURN_FALSE;
}
@@ -2833,11 +2833,11 @@
}
}
- if (from > string.len) {
+ if ((unsigned int)from > string.len) {
RETURN_FALSE;
}
- if (((unsigned) from + (unsigned) len) > string.len) {
+ if (((unsigned int)from + (unsigned int)len) > string.len) {
len = string.len - from;
}
@@ -3219,7 +3219,7 @@
}
if (ZEND_NUM_ARGS() < 3) {
- strict = MBSTRG(strict_detection);
+ strict = (zend_bool)MBSTRG(strict_detection);
}
if (size > 0 && list != NULL) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.53.2.1.2.4.2.10&r2=1.53.2.1.2.4.2.11&diff_format=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.10
php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.11
--- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.10Tue Jul 22
09:18:30 2008
+++ php-src/ext/mbstring/php_mbregex.c Fri Jul 25 14:04:54 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.10 2008/07/22 09:18:30 moriyoshi Exp $
*/
+/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.11 2008/07/25 14:04:54 moriyoshi Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -928,7 +928,7 @@
zval_dtor(&v);
}
n = regs->end[0];
- if ((size_t)(pos - (OnigUChar *)string) < n) {
+ if ((pos - (OnigUChar *)string) < n) {
pos = (OnigUChar *)string + n;
} else {
if (pos < string_lim) {
@@ -1021,7 +1021,7 @@
}
/* add it to the array */
- if (regs->beg[0] < string_len && regs->beg[0] >= (size_t)(pos -
(OnigUChar *)string)) {
+ if (regs->beg[0] < string_len && regs->beg[0] >= (pos -
(OnigUChar *)string)) {
add_next_index_stringl(return_value, (char *)pos,
((OnigUChar *)(string + regs->beg[0]) - pos), 1);
} else {
err = -2;
@@ -1246,7 +1246,7 @@
char *arg_pattern, *arg_options;
int arg_pattern_len, arg_options_len;
OnigSyntaxType *syntax = NULL;
- int option;
+ OnigOptionType option;
if (zend_parse_parameters(argc TSRMLS_CC, "z|ss", &arg_str,
&arg_pattern, &arg_pattern_len, &arg_options, &arg_options_len) == 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/mbstring mbstring.c php_mbregex.c
moriyoshi Fri Jul 25 14:04:39 2008 UTC
Modified files:
/php-src/ext/mbstring mbstring.c php_mbregex.c
Log:
- Fix warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.290&r2=1.291&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.290
php-src/ext/mbstring/mbstring.c:1.291
--- php-src/ext/mbstring/mbstring.c:1.290 Fri Jul 25 13:56:50 2008
+++ php-src/ext/mbstring/mbstring.c Fri Jul 25 14:04:39 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.290 2008/07/25 13:56:50 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.291 2008/07/25 14:04:39 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -2269,7 +2269,7 @@
RETURN_FALSE;
}
- if (offset > haystack.len) {
+ if ((unsigned int)offset > haystack.len) {
RETURN_FALSE;
}
@@ -2677,11 +2677,11 @@
}
}
- if (from > string.len) {
+ if ((unsigned int)from > string.len) {
RETURN_FALSE;
}
- if (((unsigned) from + (unsigned) len) > string.len) {
+ if (((unsigned int)from + (unsigned int)len) > string.len) {
len = string.len - from;
}
@@ -3063,7 +3063,7 @@
}
if (ZEND_NUM_ARGS() < 3) {
- strict = MBSTRG(strict_detection);
+ strict = (zend_bool)MBSTRG(strict_detection);
}
if (size > 0 && list != NULL) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.63&r2=1.64&diff_format=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.63
php-src/ext/mbstring/php_mbregex.c:1.64
--- php-src/ext/mbstring/php_mbregex.c:1.63 Thu Jul 17 16:08:08 2008
+++ php-src/ext/mbstring/php_mbregex.c Fri Jul 25 14:04:39 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.63 2008/07/17 16:08:08 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.64 2008/07/25 14:04:39 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -921,7 +921,7 @@
zval_dtor(&v);
}
n = regs->end[0];
- if ((size_t)(pos - (OnigUChar *)string) < n) {
+ if ((pos - (OnigUChar *)string) < n) {
pos = (OnigUChar *)string + n;
} else {
if (pos < string_lim) {
@@ -1014,7 +1014,7 @@
}
/* add it to the array */
- if (regs->beg[0] < string_len && regs->beg[0] >= (size_t)(pos -
(OnigUChar *)string)) {
+ if (regs->beg[0] < string_len && regs->beg[0] >= (pos -
(OnigUChar *)string)) {
add_next_index_stringl(return_value, (char *)pos,
((OnigUChar *)(string + regs->beg[0]) - pos), 1);
} else {
err = -2;
@@ -1246,7 +1246,7 @@
{
zval **arg_str, **arg_pattern, **arg_options;
OnigSyntaxType *syntax = NULL;
- int option;
+ OnigOptionType option;
option = MBREX(regex_default_options);
syntax = MBREX(regex_default_syntax);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c
moriyoshi Fri Jul 25 13:57:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
Log:
- MFH: Fix wrong cast
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.23&r2=1.224.2.22.2.25.2.24&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.23
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.24
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.23Fri Jul 25
12:51:47 2008
+++ php-src/ext/mbstring/mbstring.c Fri Jul 25 13:57:23 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.23 2008/07/25 12:51:47 moriyoshi Exp $
*/
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.24 2008/07/25 13:57:23 moriyoshi Exp $
*/
/*
* PHP 4 Multibyte String module "mbstring"
@@ -,7 +,7 @@
list_size += strlen(name) + 1;
if (!list) {
list = (char*)emalloc(list_size);
- *list = (char)NULL;
+ *list = '\0';
} else {
list = (char*)erealloc(list, list_size);
strcat(list, ",");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
moriyoshi Fri Jul 25 13:56:50 2008 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
- Fix wrong cast
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.289&r2=1.290&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.289
php-src/ext/mbstring/mbstring.c:1.290
--- php-src/ext/mbstring/mbstring.c:1.289 Fri Jul 25 12:50:14 2008
+++ php-src/ext/mbstring/mbstring.c Fri Jul 25 13:56:50 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.289 2008/07/25 12:50:14 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.290 2008/07/25 13:56:50 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -4862,7 +4862,7 @@
list_size += strlen(name) + 1;
if (!list) {
list = (char*)emalloc(list_size);
- *list = (char)NULL;
+ *list = '\0';
} else {
list = (char*)erealloc(list, list_size);
strcat(list, ",");
--
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) /main main.c
felipe Fri Jul 25 13:46:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main main.c
Log:
- MFB: Fixed the parameter type expected. set_time_limit() should accept only
integer.
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.26&r2=1.640.2.23.2.57.2.27&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.26
php-src/main/main.c:1.640.2.23.2.57.2.27
--- php-src/main/main.c:1.640.2.23.2.57.2.26Mon Jul 21 09:40:59 2008
+++ php-src/main/main.c Fri Jul 25 13:46:56 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23.2.57.2.26 2008/07/21 09:40:59 bjori Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.27 2008/07/25 13:46:56 felipe Exp $ */
/* {{{ includes
*/
@@ -1028,23 +1028,27 @@
Sets the maximum time a script can run */
PHP_FUNCTION(set_time_limit)
{
- zval **new_timeout;
+ long new_timeout;
+ char *new_timeout_str;
+ int new_timeout_strlen;
if (PG(safe_mode)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot set time
limit in safe mode");
RETURN_FALSE;
}
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &new_timeout)
== FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &new_timeout)
== FAILURE) {
return;
}
+
+ new_timeout_strlen = zend_spprintf(&new_timeout_str, 0, "%ld",
new_timeout);
- convert_to_string_ex(new_timeout);
- if (zend_alter_ini_entry_ex("max_execution_time",
sizeof("max_execution_time"), Z_STRVAL_PP(new_timeout),
Z_STRLEN_PP(new_timeout), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) ==
SUCCESS) {
- RETURN_TRUE;
+ if (zend_alter_ini_entry_ex("max_execution_time",
sizeof("max_execution_time"), new_timeout_str, new_timeout_strlen,
PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) == SUCCESS) {
+ RETVAL_TRUE;
} else {
- RETURN_FALSE;
+ RETVAL_FALSE;
}
+ efree(new_timeout_str);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo config.m4 /ext/pdo_dblib config.m4 /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql con
janiFri Jul 25 13:46:24 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdoconfig.m4 /php-src/ext/pdo_dblib config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_odbc config.m4 /php-src/ext/pdo_pgsql config.m4 /php-src/ext/pdo_sqlite config.m4 Log: MFH: Fix PDO configure dependancy: If --disable-pdo is used, disable all MFH: enabled-by-default drivers. Also error out if you try to configure MFH: a driver as static but pdo is disabled. http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/config.m4?r1=1.15.2.3.2.1&r2=1.15.2.3.2.1.2.1&diff_format=u Index: php-src/ext/pdo/config.m4 diff -u php-src/ext/pdo/config.m4:1.15.2.3.2.1 php-src/ext/pdo/config.m4:1.15.2.3.2.1.2.1 --- php-src/ext/pdo/config.m4:1.15.2.3.2.1 Thu Aug 24 16:00:43 2006 +++ php-src/ext/pdo/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.15.2.3.2.1 2006/08/24 16:00:43 tony2001 Exp $ +dnl $Id: config.m4,v 1.15.2.3.2.1.2.1 2008/07/25 13:46:23 jani Exp $ dnl config.m4 for extension pdo dnl vim:se ts=2 sw=2 et: @@ -32,6 +32,9 @@ if test "$PHP_PDO" != "no"; then + dnl Make sure $PHP_PDO is 'yes' when it's not 'no' :) + PHP_PDO=yes + PHP_PDO_PEAR_CHECK if test "$ext_shared" = "yes" ; then http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/config.m4?r1=1.2.2.2.2.1&r2=1.2.2.2.2.1.2.1&diff_format=u Index: php-src/ext/pdo_dblib/config.m4 diff -u php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1 php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1.2.1 --- php-src/ext/pdo_dblib/config.m4:1.2.2.2.2.1 Tue Jul 3 17:25:34 2007 +++ php-src/ext/pdo_dblib/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,15 +1,16 @@ dnl -dnl $Id: config.m4,v 1.2.2.2.2.1 2007/07/03 17:25:34 sniper Exp $ +dnl $Id: config.m4,v 1.2.2.2.2.1.2.1 2008/07/25 13:46:23 jani Exp $ dnl -if test "$PHP_PDO" != "no"; then PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS, -[ --with-pdo-dblib[=DIR]PDO: DBLIB-DB support. DIR is the FreeTDS home -directory]) - +[ --with-pdo-dblib[=DIR]PDO: DBLIB-DB support. DIR is the FreeTDS home directory]) if test "$PHP_PDO_DBLIB" != "no"; then + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then +AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + if test "$PHP_PDO_DBLIB" = "yes"; then for i in /usr/local /usr; do @@ -84,5 +85,3 @@ PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo) ]) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.8.4.2&r2=1.8.4.2.2.1&diff_format=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.8.4.2 php-src/ext/pdo_firebird/config.m4:1.8.4.2.2.1 --- php-src/ext/pdo_firebird/config.m4:1.8.4.2 Tue Jul 31 13:02:00 2007 +++ php-src/ext/pdo_firebird/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,14 +1,17 @@ dnl -dnl $Id: config.m4,v 1.8.4.2 2007/07/31 13:02:00 jani Exp $ +dnl $Id: config.m4,v 1.8.4.2.2.1 2008/07/25 13:46:23 jani Exp $ dnl -if test "$PHP_PDO" != "no"; then - PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO, [ --with-pdo-firebird[=DIR] PDO: Firebird support. DIR is the Firebird base install directory [/opt/firebird]]) if test "$PHP_PDO_FIREBIRD" != "no"; then + + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then +AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + if test "$PHP_PDO_FIREBIRD" = "yes"; then FIREBIRD_INCDIR=/opt/firebird/include FIREBIRD_LIBDIR=/opt/firebird/lib @@ -49,5 +52,3 @@ PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.25.2.7.2.6.2.2&r2=1.25.2.7.2.6.2.3&diff_format=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.2 php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.3 --- php-src/ext/pdo_mysql/config.m4:1.25.2.7.2.6.2.2Mon Jul 21 13:09:27 2008 +++ php-src/ext/pdo_mysql/config.m4 Fri Jul 25 13:46:23 2008 @@ -1,6 +1,6 @@ -dnl -dnl $Id: config.m4,v 1.25.2.7.2.6.2.2 2008/07/21 13:09:27 johannes Exp $ -dnl +dnl $Id: config.m4,v 1.25.2.7.2.6.2.3 2008/07/25 13:46:23 jani Exp $ ++ dnl config.m4 for extension pdo_mysql ++ dnl vim: se ts=2 sw=2 et: PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO, [ --with-pdo-mysql[=DIR]PDO: MySQL support. DIR is the MySQL base directoy @@ -13,6 +13,11 @@ fi if test "$PHP_PDO_MYSQL" != "no"; then + + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then +AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + PHP_MYSQLND_ENABLED=yes AC_DEFUN([PDO_MYSQL_LIB_CHK], [ @@ -170,5 +175,3 @@ PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE) fi - -dnl vim: se ts=2 s
[PHP-CVS] cvs: php-src /main main.c
felipe Fri Jul 25 13:39:39 2008 UTC
Modified files:
/php-src/main main.c
Log:
- Fixed the parameter type expected. set_time_limit() should accept only
integer.
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.774&r2=1.775&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.774 php-src/main/main.c:1.775
--- php-src/main/main.c:1.774 Fri Jul 25 12:14:36 2008
+++ php-src/main/main.c Fri Jul 25 13:39:39 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.774 2008/07/25 12:14:36 felipe Exp $ */
+/* $Id: main.c,v 1.775 2008/07/25 13:39:39 felipe Exp $ */
/* {{{ includes
*/
@@ -1120,18 +1120,22 @@
Sets the maximum time a script can run */
PHP_FUNCTION(set_time_limit)
{
- zval **new_timeout;
+ long new_timeout;
+ char *new_timeout_str;
+ int new_timeout_strlen;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &new_timeout)
== FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &new_timeout)
== FAILURE) {
return;
}
+
+ new_timeout_strlen = zend_spprintf(&new_timeout_str, 0, "%ld",
new_timeout);
- convert_to_string_ex(new_timeout);
- if (zend_alter_ini_entry_ex("max_execution_time",
sizeof("max_execution_time"), Z_STRVAL_PP(new_timeout),
Z_STRLEN_PP(new_timeout), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) ==
SUCCESS) {
- RETURN_TRUE;
+ if (zend_alter_ini_entry_ex("max_execution_time",
sizeof("max_execution_time"), new_timeout_str, new_timeout_strlen,
PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC) == SUCCESS) {
+ RETVAL_TRUE;
} else {
- RETURN_FALSE;
+ RETVAL_FALSE;
}
+ efree(new_timeout_str);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo config.m4 /ext/pdo_dblib config.m4 /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql config.m4 /
janiFri Jul 25 13:38:41 2008 UTC Modified files: /php-src/ext/pdoconfig.m4 /php-src/ext/pdo_dblib config.m4 /php-src/ext/pdo_firebird config.m4 /php-src/ext/pdo_mysql config.m4 /php-src/ext/pdo_ociconfig.m4 /php-src/ext/pdo_odbc config.m4 /php-src/ext/pdo_pgsql config.m4 /php-src/ext/pdo_sqlite config.m4 Log: - Fix PDO configure dependancy: If --disable-pdo is used, disable all enabled-by-default drivers. Also error out if you try to configure a driver as static but pdo is disabled. http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/config.m4?r1=1.19&r2=1.20&diff_format=u Index: php-src/ext/pdo/config.m4 diff -u php-src/ext/pdo/config.m4:1.19 php-src/ext/pdo/config.m4:1.20 --- php-src/ext/pdo/config.m4:1.19 Wed Apr 25 07:47:15 2007 +++ php-src/ext/pdo/config.m4 Fri Jul 25 13:38:40 2008 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.19 2007/04/25 07:47:15 sniper Exp $ +dnl $Id: config.m4,v 1.20 2008/07/25 13:38:40 jani Exp $ dnl config.m4 for extension pdo dnl vim:se ts=2 sw=2 et: @@ -32,6 +32,9 @@ if test "$PHP_PDO" != "no"; then + dnl Make sure $PHP_PDO is 'yes' when it's not 'no' :) + PHP_PDO=yes + PHP_PDO_PEAR_CHECK if test "$ext_shared" = "yes" ; then http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/config.m4?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/pdo_dblib/config.m4 diff -u php-src/ext/pdo_dblib/config.m4:1.5 php-src/ext/pdo_dblib/config.m4:1.6 --- php-src/ext/pdo_dblib/config.m4:1.5 Tue Jul 3 17:24:37 2007 +++ php-src/ext/pdo_dblib/config.m4 Fri Jul 25 13:38:40 2008 @@ -1,14 +1,16 @@ dnl -dnl $Id: config.m4,v 1.5 2007/07/03 17:24:37 sniper Exp $ +dnl $Id: config.m4,v 1.6 2008/07/25 13:38:40 jani Exp $ dnl -if test "$PHP_PDO" != "no"; then PHP_ARG_WITH(pdo-dblib, for PDO_DBLIB support via FreeTDS, -[ --with-pdo-dblib[=DIR]PDO: DBLIB-DB support. DIR is the FreeTDS home -directory]) +[ --with-pdo-dblib[=DIR]PDO: DBLIB-DB support. DIR is the FreeTDS home directory]) if test "$PHP_PDO_DBLIB" != "no"; then + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then +AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + PDO_FREETDS_INSTALLATION_DIR="" if test "$PHP_PDO_DBLIB" = "yes"; then @@ -77,5 +79,3 @@ PHP_ADD_EXTENSION_DEP(pdo_dblib, pdo) ]) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_firebird/config.m4?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/pdo_firebird/config.m4 diff -u php-src/ext/pdo_firebird/config.m4:1.10 php-src/ext/pdo_firebird/config.m4:1.11 --- php-src/ext/pdo_firebird/config.m4:1.10 Tue Jul 31 13:01:42 2007 +++ php-src/ext/pdo_firebird/config.m4 Fri Jul 25 13:38:40 2008 @@ -1,14 +1,17 @@ dnl -dnl $Id: config.m4,v 1.10 2007/07/31 13:01:42 jani Exp $ +dnl $Id: config.m4,v 1.11 2008/07/25 13:38:40 jani Exp $ dnl -if test "$PHP_PDO" != "no"; then - PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO, [ --with-pdo-firebird[=DIR] PDO: Firebird support. DIR is the Firebird base install directory [/opt/firebird]]) if test "$PHP_PDO_FIREBIRD" != "no"; then + + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then +AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + if test "$PHP_PDO_FIREBIRD" = "yes"; then FIREBIRD_INCDIR=/opt/firebird/include FIREBIRD_LIBDIR=/opt/firebird/lib @@ -49,5 +52,3 @@ PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD) PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo) fi - -fi http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/config.m4?r1=1.28&r2=1.29&diff_format=u Index: php-src/ext/pdo_mysql/config.m4 diff -u php-src/ext/pdo_mysql/config.m4:1.28 php-src/ext/pdo_mysql/config.m4:1.29 --- php-src/ext/pdo_mysql/config.m4:1.28Mon Jul 21 13:05:50 2008 +++ php-src/ext/pdo_mysql/config.m4 Fri Jul 25 13:38:40 2008 @@ -1,6 +1,6 @@ -dnl -dnl $Id: config.m4,v 1.28 2008/07/21 13:05:50 johannes Exp $ -dnl +dnl $Id: config.m4,v 1.29 2008/07/25 13:38:40 jani Exp $ +dnl config.m4 for extension pdo_mysql +dnl vim: se ts=2 sw=2 et: dnl TODO Rename when moving to pdo_mysql PHP_ARG_WITH(pdo-mysql, for MySQL support for PDO, @@ -14,6 +14,11 @@ fi if test "$PHP_PDO_MYSQL" != "no"; then + + if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then +AC_MSG_ERROR([PDO is not enabled! Add --enable-pdo to your configure line.]) + fi + PHP_MYSQLND_ENABLED=yes AC_DEFUN([PDO_MYSQL_LIB_CHK], [ @@ -171,5 +176,3 @@ PHP_SUBST_OLD(PDO_MYSQL_MODULE_TYPE) fi - -dnl vim: se ts=2 sw=2 et: http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.23&r2=1.24&diff_format=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.23 php-src/ext/pdo_oci/config.m4:1.24 --- php-src/ext/pdo_oci/config.m4:1.23 Fri Aug 31 21:11:03 2007 +++ php-src/ext/pdo_oci/config.m4 Fri Jul 25
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js
pajoye Fri Jul 25 12:40:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js
Log:
- MFH: fix EXT_FOO_SHARED usage as dep mgt broke it (one more hack but we can
clean them after alpha)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.28&r2=1.60.2.1.2.8.2.29&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.28
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.29
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.28 Sun Jul 20 02:20:31 2008
+++ php-src/win32/build/confutils.jsFri Jul 25 12:40:45 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.28 2008/07/20 02:20:31 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.29 2008/07/25 12:40:45 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1145,10 +1145,13 @@
var objs = null;
var EXT = extname.toUpperCase();
var extname_for_printing;
-
+
if (shared == null) {
eval("shared = PHP_" + EXT + "_SHARED;");
+ } else {
+ eval("PHP_" + EXT + "_SHARED = shared;");
}
+
if (cflags == null) {
cflags = "";
}
--
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/ming ming.c php_ming.h
On Fri, 25 Jul 2008, Derick Rethans wrote: > On Thu, 24 Jul 2008, Frank M. Kromann wrote: > > > fmk Thu Jul 24 08:02:39 2008 UTC > > > > Modified files: (Branch: PHP_5_3) > > /php-src/ext/ming ming.c php_ming.h > > Log: > > Syncronize the ming extension with libming 0.4 > > [DOC] PHP 5.3 requires libming 0.4 > > Is that really necessary? libming 0.3 has been working fine, and it's > the latest that debian unstable has - could you please see if it'd be > possible to support that as well? This is even more useful as PHP < 5.3 doesn't compile against libming 0.4. In order to be able to run both 5.2 and 5.3 I need both version of the lib - something that many distributions don't do. regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c /ext/mbstring/tests mb_stripos.phpt mb_stripos_basic.phpt mb_stripos_error1.phpt mb_stripos_error2.phpt mb_stripos_variation1.phpt mb_stripos_
moriyoshi Fri Jul 25 12:51:47 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mbstring/tests mb_stripos.phpt mb_stripos_basic.phpt
mb_stripos_error1.phpt
mb_stripos_error2.phpt
mb_stripos_variation1.phpt
mb_stripos_variation2.phpt
mb_stripos_variation3.phpt
mb_stripos_variation4.phpt
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
- MFH: Fix a typo in mb_stripos() that caused segfaults (noticed by [EMAIL
PROTECTED], thanks).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.22&r2=1.224.2.22.2.25.2.23&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.22
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.23
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.22Thu Jul 24
22:21:41 2008
+++ php-src/ext/mbstring/mbstring.c Fri Jul 25 12:51:47 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.22 2008/07/24 22:21:41 moriyoshi Exp $
*/
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.23 2008/07/25 12:51:47 moriyoshi Exp $
*/
/*
* PHP 4 Multibyte String module "mbstring"
@@ -2392,10 +2392,13 @@
n = -1;
offset = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ls", (char
**)&haystack.val, (int *)&haystack.len, (char **)needle.val, (int
*)&needle.len, &offset, &from_encoding, &from_encoding_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ls", (char
**)&haystack.val, (int *)&haystack.len, (char **)&needle.val, (int
*)&needle.len, &offset, &from_encoding, &from_encoding_len) == FAILURE) {
+ RETURN_FALSE;
+ }
+ if (needle.len == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");
RETURN_FALSE;
}
-
n = php_mb_stripos(0, (char *)haystack.val, haystack.len, (char
*)needle.val, needle.len, offset, from_encoding TSRMLS_CC);
if (n >= 0) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_stripos.phpt
+++ php-src/ext/mbstring/tests/mb_stripos.phpt
--TEST--
mb_stripos()
--SKIPIF--
--FILE--
--EXPECT--
== POSITIVE OFFSET ==
10
0
3
0
34
30
33
30
== NEGATIVE OFFSET ==
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
== OUT OF RANGE ==
OK_OUT_RANGE
OK_OUT_RANGE
OK_OUT_RANGE
OK_OUT_RANGE
== NON-EXISTENT ==
OK_STR
OK_NEWLINE
== NO ENCODING PARAMETER ==
10
0
3
0
OK_STR
OK_NEWLINE
== NO OFFSET AND ENCODING PARAMETER ==
10
0
3
0
OK_STR
OK_NEWLINE
== INVALID PARAMETER TEST ==
ERR: Warning
OK_NULL
ERR: Warning
OK_ARRAY
ERR: Warning
OK_OBJECT
ERR: Warning
OK_BAD_ENCODING
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_stripos_basic.phpt
+++ php-src/ext/mbstring/tests/mb_stripos_basic.phpt
--TEST--
Test mb_stripos() function : basic functionality
--SKIPIF--
--FILE--
--EXPECTF--
*** Testing mb_stripos() : basic functionality***
-- ISO-8859-1 string 1 --
int(4)
-- ISO-8859-1 string 2 --
int(4)
-- ISO-8859-1 string 3 --
int(4)
-- ISO-8859-1 string 4 --
int(4)
-- ISO-8859-1 string 5 --
int(10)
-- ISO-8859-1 string 6 --
int(2)
-- ISO-8859-1 string 7 --
int(2)
-- ISO-8859-1 string 8 --
int(4)
-- ISO-8859-1 string 9 --
bool(false)
-- ISO-8859-1 string 10 --
int(2)
-- ISO-8859-1 string 11 --
int(2)
-- ISO-8859-1 string 12 --
int(4)
-- ISO-8859-1 string 13 --
bool(false)
-- ISO-8859-1 string 14 --
int(10)
-- ISO-8859-1 string 15 --
int(10)
-- ISO-8859-1 string 16 --
int(4)
-- ISO-8859-1 string 17 --
int(12)
-- ISO-8859-1 string 18 --
bool(false)
-- Multibyte string 1 --
int(0)
-- Multibyte string 2 --
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos_error1.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_stripos_error1.phpt
+++ php-src/ext/mbstring/tests/mb_stripos_error1.phpt
--TEST--
Test mb_stripos() function : error conditions - Pass incorrect number of args
--SKIPIF--
--FILE--
--EXPECTF--
*** Testing mb_stripos() : error conditions ***
-- Testing mb_stripos() function with more than expected no. of arguments --
Warning: mb_stripos() expects at most 4 parameters, 5 given in %s on line %d
bool(false)
-- Testing mb_stripos() function with less than expected no. of arguments --
Warning: mb_stripos() expects at least 2 parameters, 1 given in %
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c /ext/mbstring/tests mb_stripos.phpt mb_stripos_basic.phpt mb_stripos_error1.phpt mb_stripos_error2.phpt mb_stripos_variation1.phpt mb_stripos_variation
moriyoshi Fri Jul 25 12:50:14 2008 UTC
Added files:
/php-src/ext/mbstring/tests mb_stripos.phpt mb_stripos_basic.phpt
mb_stripos_error1.phpt
mb_stripos_error2.phpt
mb_stripos_variation1.phpt
mb_stripos_variation2.phpt
mb_stripos_variation3.phpt
mb_stripos_variation4.phpt
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
- fix a typo in mb_stripos() that caused segfault.
(noticed by [EMAIL PROTECTED], thanks).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.288&r2=1.289&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.288
php-src/ext/mbstring/mbstring.c:1.289
--- php-src/ext/mbstring/mbstring.c:1.288 Thu Jul 24 13:46:35 2008
+++ php-src/ext/mbstring/mbstring.c Fri Jul 25 12:50:14 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.288 2008/07/24 13:46:35 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.289 2008/07/25 12:50:14 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -2236,10 +2236,13 @@
n = -1;
offset = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ls", (char
**)&haystack.val, (int *)&haystack.len, (char **)needle.val, (int
*)&needle.len, &offset, &from_encoding, &from_encoding_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|ls", (char
**)&haystack.val, (int *)&haystack.len, (char **)&needle.val, (int
*)&needle.len, &offset, &from_encoding, &from_encoding_len) == FAILURE) {
+ RETURN_FALSE;
+ }
+ if (needle.len == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");
RETURN_FALSE;
}
-
n = php_mb_stripos(0, (char *)haystack.val, haystack.len, (char
*)needle.val, needle.len, offset, from_encoding TSRMLS_CC);
if (n >= 0) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_stripos.phpt
+++ php-src/ext/mbstring/tests/mb_stripos.phpt
--TEST--
mb_stripos()
--SKIPIF--
--FILE--
--EXPECT--
== POSITIVE OFFSET ==
10
0
3
0
34
30
33
30
== NEGATIVE OFFSET ==
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
ERR: Warning
OK_NEGATIVE_OFFSET
== OUT OF RANGE ==
OK_OUT_RANGE
OK_OUT_RANGE
OK_OUT_RANGE
OK_OUT_RANGE
== NON-EXISTENT ==
OK_STR
OK_NEWLINE
== NO ENCODING PARAMETER ==
10
0
3
0
OK_STR
OK_NEWLINE
== NO OFFSET AND ENCODING PARAMETER ==
10
0
3
0
OK_STR
OK_NEWLINE
== INVALID PARAMETER TEST ==
ERR: Warning
OK_NULL
ERR: Warning
OK_ARRAY
ERR: Warning
OK_OBJECT
ERR: Warning
OK_BAD_ENCODING
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos_basic.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_stripos_basic.phpt
+++ php-src/ext/mbstring/tests/mb_stripos_basic.phpt
--TEST--
Test mb_stripos() function : basic functionality
--SKIPIF--
--FILE--
--EXPECTF--
*** Testing mb_stripos() : basic functionality***
-- ISO-8859-1 string 1 --
int(4)
-- ISO-8859-1 string 2 --
int(4)
-- ISO-8859-1 string 3 --
int(4)
-- ISO-8859-1 string 4 --
int(4)
-- ISO-8859-1 string 5 --
int(10)
-- ISO-8859-1 string 6 --
int(2)
-- ISO-8859-1 string 7 --
int(2)
-- ISO-8859-1 string 8 --
int(4)
-- ISO-8859-1 string 9 --
bool(false)
-- ISO-8859-1 string 10 --
int(2)
-- ISO-8859-1 string 11 --
int(2)
-- ISO-8859-1 string 12 --
int(4)
-- ISO-8859-1 string 13 --
bool(false)
-- ISO-8859-1 string 14 --
int(10)
-- ISO-8859-1 string 15 --
int(10)
-- ISO-8859-1 string 16 --
int(4)
-- ISO-8859-1 string 17 --
int(12)
-- ISO-8859-1 string 18 --
bool(false)
-- Multibyte string 1 --
int(0)
-- Multibyte string 2 --
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos_error1.phpt?view=markup&rev=1.1
Index: php-src/ext/mbstring/tests/mb_stripos_error1.phpt
+++ php-src/ext/mbstring/tests/mb_stripos_error1.phpt
--TEST--
Test mb_stripos() function : error conditions - Pass incorrect number of args
--SKIPIF--
--FILE--
--EXPECTF--
*** Testing mb_stripos() : error conditions ***
-- Testing mb_stripos() function with more than expected no. of arguments --
Warning: mb_stripos() expects at most 4 parameters, 5 given in %s on line %d
bool(false)
-- Testing mb_stripos() function with less than expected no. of arguments --
Warning: mb_stripos() expects at least 2 parameters, 1 given in %s on line %d
bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos_error2.phpt?view=markup&rev=
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqli mysqli_api.c /ext/mysqli/tests bug45019.phpt
andrey Fri Jul 25 12:46:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/mysqli/tests bug45019.phpt
Log:
MFH: Fixed bug#45019 Segmentation fault with SELECT ? and UNION
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.22.2.16.2.18&r2=1.118.2.22.2.16.2.19&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.18
php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.19
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.22.2.16.2.18Thu Jul 17
09:53:41 2008
+++ php-src/ext/mysqli/mysqli_api.c Fri Jul 25 12:46:03 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.118.2.22.2.16.2.18 2008/07/17 09:53:41 dmitry Exp $
+ $Id: mysqli_api.c,v 1.118.2.22.2.16.2.19 2008/07/25 12:46:03 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -389,8 +389,13 @@
if (stmt->stmt->fields[ofs].max_length == 0 &&
!mysql_stmt_attr_get(stmt->stmt,
STMT_ATTR_UPDATE_MAX_LENGTH, &tmp) && !tmp)
{
- stmt->result.buf[ofs].buflen =
- (stmt->stmt->fields) ?
(stmt->stmt->fields[ofs].length) ? stmt->stmt->fields[ofs].length + 1: 256: 256;
+ /*
+ Allocate directly 256 because it's
easier to allocate a bit more
+ than update max length even for text
columns. Try SELECT UNION SELECT UNION with
+ different lengths and you will see
that we get different lengths in stmt->stmt->fields[ofs].length
+ The just take 256 and saves us from
realloc-ing.
+ */
+ stmt->result.buf[ofs].buflen = 256;
} else {
/*
the user has called
store_result(). if he does not there is no way to determine the
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug45019.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/mysqli/tests/bug45019.phpt
diff -u php-src/ext/mysqli/tests/bug45019.phpt:1.1.2.2
php-src/ext/mysqli/tests/bug45019.phpt:1.1.2.3
--- php-src/ext/mysqli/tests/bug45019.phpt:1.1.2.2 Thu Jul 24 14:17:47 2008
+++ php-src/ext/mysqli/tests/bug45019.phpt Fri Jul 25 12:46:03 2008
@@ -57,7 +57,7 @@
printf("[006] [%d] %s\n", $link->errno, $link->error);
$column1 = null;
- if (!$stmt->bind_result($column1) || !$stmt->execute())
+ if (!$stmt->execute() || !$stmt->bind_result($column1))
printf("[007] [%d] %s\n", $stmt->errno, $stmt->error);
$index = 0;
@@ -153,6 +153,6 @@
string(3) "two"
Testing bind_param(), strings only, with CAST AS CHAR...
string(3) "one"
-string(5) "three beers are more than enough"
+string(32) "three beers are more than enough"
string(3) "two"
-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] cvs: php-src /ext/mysqli mysqli_api.c /ext/mysqli/tests bug45019.phpt
andrey Fri Jul 25 12:45:27 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli_api.c
/php-src/ext/mysqli/tests bug45019.phpt
Log:
Fix bug#45019 Segmentation fault with SELECT ? and UNION
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.166&r2=1.167&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.166
php-src/ext/mysqli/mysqli_api.c:1.167
--- php-src/ext/mysqli/mysqli_api.c:1.166 Thu Jul 17 09:52:51 2008
+++ php-src/ext/mysqli/mysqli_api.c Fri Jul 25 12:45:27 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli_api.c,v 1.166 2008/07/17 09:52:51 dmitry Exp $
+ $Id: mysqli_api.c,v 1.167 2008/07/25 12:45:27 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -389,8 +389,13 @@
if (stmt->stmt->fields[ofs].max_length == 0 &&
!mysql_stmt_attr_get(stmt->stmt,
STMT_ATTR_UPDATE_MAX_LENGTH, &tmp) && !tmp)
{
- stmt->result.buf[ofs].buflen =
- (stmt->stmt->fields) ?
(stmt->stmt->fields[ofs].length) ? stmt->stmt->fields[ofs].length + 1: 256: 256;
+ /*
+ Allocate directly 256 because it's
easier to allocate a bit more
+ than update max length even for text
columns. Try SELECT UNION SELECT UNION with
+ different lengths and you will see
that we get different lengths in stmt->stmt->fields[ofs].length
+ The just take 256 and saves us from
realloc-ing.
+ */
+ stmt->result.buf[ofs].buflen = 256;
} else {
/*
the user has called
store_result(). if he does not there is no way to determine the
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug45019.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysqli/tests/bug45019.phpt
diff -u php-src/ext/mysqli/tests/bug45019.phpt:1.1
php-src/ext/mysqli/tests/bug45019.phpt:1.2
--- php-src/ext/mysqli/tests/bug45019.phpt:1.1 Thu Jul 24 14:17:27 2008
+++ php-src/ext/mysqli/tests/bug45019.phpt Fri Jul 25 12:45:27 2008
@@ -57,7 +57,7 @@
printf("[006] [%d] %s\n", $link->errno, $link->error);
$column1 = null;
- if (!$stmt->bind_result($column1) || !$stmt->execute())
+ if (!$stmt->execute() || !$stmt->bind_result($column1))
printf("[007] [%d] %s\n", $stmt->errno, $stmt->error);
$index = 0;
@@ -153,6 +153,6 @@
string(3) "two"
Testing bind_param(), strings only, with CAST AS CHAR...
string(3) "one"
-string(5) "three beers are more than enough"
+string(32) "three beers are more than enough"
string(3) "two"
-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] cvs: php-src(PHP_5_3) /ext/intl/locale locale_methods.c
rrichards Fri Jul 25 12:41:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/localelocale_methods.c
Log:
MFH: fix zts build
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.1.2.3
php-src/ext/intl/locale/locale_methods.c:1.1.2.4
--- php-src/ext/intl/locale/locale_methods.c:1.1.2.3Wed Jul 23 19:44:51 2008
+++ php-src/ext/intl/locale/locale_methods.cFri Jul 25 12:41:57 2008
@@ -808,7 +808,7 @@
* returns 1 if successful , -1 if not found ,
* 0 if array element is not a string , -2 if buffer-overflow
*/
-static int append_multiple_key_values(smart_str* loc_name, HashTable*
hash_arr, char* key_name)
+static int append_multiple_key_values(smart_str* loc_name, HashTable*
hash_arr, char* key_name TSRMLS_DC)
{
zval** ele_value = NULL;
int i = 0;
@@ -950,7 +950,7 @@
}
//Extlang
- result = append_multiple_key_values(loc_name, hash_arr ,
LOC_EXTLANG_TAG);
+ result = append_multiple_key_values(loc_name, hash_arr ,
LOC_EXTLANG_TAG TSRMLS_CC);
if( !handleAppendResult( result, loc_name TSRMLS_CC)){
RETURN_FALSE;
}
@@ -968,13 +968,13 @@
}
//Variant
- result = append_multiple_key_values( loc_name, hash_arr ,
LOC_VARIANT_TAG);
+ result = append_multiple_key_values( loc_name, hash_arr ,
LOC_VARIANT_TAG TSRMLS_CC);
if( !handleAppendResult( result, loc_name TSRMLS_CC)){
RETURN_FALSE;
}
//Private
- result = append_multiple_key_values( loc_name, hash_arr ,
LOC_PRIVATE_TAG);
+ result = append_multiple_key_values( loc_name, hash_arr ,
LOC_PRIVATE_TAG TSRMLS_CC);
if( !handleAppendResult( result, loc_name TSRMLS_CC)){
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/intl/locale locale_methods.c
rrichards Fri Jul 25 12:40:23 2008 UTC
Modified files:
/php-src/ext/intl/localelocale_methods.c
Log:
fix zts build
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.4
php-src/ext/intl/locale/locale_methods.c:1.5
--- php-src/ext/intl/locale/locale_methods.c:1.4Wed Jul 23 20:22:28 2008
+++ php-src/ext/intl/locale/locale_methods.cFri Jul 25 12:40:23 2008
@@ -815,7 +815,7 @@
* returns 1 if successful , -1 if not found ,
* 0 if array element is not a string , -2 if buffer-overflow
*/
-static int append_multiple_key_values(smart_str* loc_name, HashTable*
hash_arr, char* key_name)
+static int append_multiple_key_values(smart_str* loc_name, HashTable*
hash_arr, char* key_name TSRMLS_DC)
{
zval** ele_value = NULL;
int i = 0;
@@ -977,7 +977,7 @@
}
//Extlang
- result = append_multiple_key_values(loc_name, hash_arr ,
LOC_EXTLANG_TAG);
+ result = append_multiple_key_values(loc_name, hash_arr ,
LOC_EXTLANG_TAG TSRMLS_CC);
if( !handleAppendResult( result, loc_name TSRMLS_CC)){
RETURN_FALSE;
}
@@ -995,13 +995,13 @@
}
//Variant
- result = append_multiple_key_values( loc_name, hash_arr ,
LOC_VARIANT_TAG);
+ result = append_multiple_key_values( loc_name, hash_arr ,
LOC_VARIANT_TAG TSRMLS_CC);
if( !handleAppendResult( result, loc_name TSRMLS_CC)){
RETURN_FALSE;
}
//Private
- result = append_multiple_key_values( loc_name, hash_arr ,
LOC_PRIVATE_TAG);
+ result = append_multiple_key_values( loc_name, hash_arr ,
LOC_PRIVATE_TAG TSRMLS_CC);
if( !handleAppendResult( result, loc_name TSRMLS_CC)){
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Fri Jul 25 12:40:13 2008 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
- fix EXT_FOO_SHARED usage as dep mgt broke it (one more hack but we can
clean them after alpha)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.78&r2=1.79&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.78
php-src/win32/build/confutils.js:1.79
--- php-src/win32/build/confutils.js:1.78 Mon Jul 21 17:00:34 2008
+++ php-src/win32/build/confutils.jsFri Jul 25 12:40:13 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.78 2008/07/21 17:00:34 pajoye Exp $
+// $Id: confutils.js,v 1.79 2008/07/25 12:40:13 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1150,10 +1150,13 @@
var objs = null;
var EXT = extname.toUpperCase();
var extname_for_printing;
-
+
if (shared == null) {
eval("shared = PHP_" + EXT + "_SHARED;");
+ } else {
+ eval("PHP_" + EXT + "_SHARED = shared;");
}
+
if (cflags == null) {
cflags = "";
}
--
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) / configure.in /scripts phpize.m4
janiFri Jul 25 12:36:59 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcconfigure.in /php-src/scriptsphpize.m4 Log: MFH: Fixed a minor problem in not enabling c++/g++ when not needed. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.100&r2=1.579.2.52.2.101&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.100 php-src/configure.in:1.579.2.52.2.101 --- php-src/configure.in:1.579.2.52.2.100 Wed Jul 16 16:30:04 2008 +++ php-src/configure.inFri Jul 25 12:36:59 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.100 2008/07/16 16:30:04 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.101 2008/07/25 12:36:59 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1259,10 +1259,14 @@ LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" -dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) -dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler -AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) -AC_DEFUN([AC_PROG_CXX], [])]) +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). +dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ + undefine([AC_PROG_CXX]) + AC_DEFUN([AC_PROG_CXX], []) + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], []) +]) AC_PROG_LIBTOOL if test "$enable_debug" != "yes"; then http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5&r2=1.17.2.3.2.6&diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5 php-src/scripts/phpize.m4:1.17.2.3.2.6 --- php-src/scripts/phpize.m4:1.17.2.3.2.5 Tue Aug 14 08:43:41 2007 +++ php-src/scripts/phpize.m4 Fri Jul 25 12:36:59 2008 @@ -70,10 +70,14 @@ enable_static=no enable_shared=yes -dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) -dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler -AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) -AC_DEFUN([AC_PROG_CXX], [])]) +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). +dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ + undefine([AC_PROG_CXX]) + AC_DEFUN([AC_PROG_CXX], []) + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], []) +]) AC_PROG_LIBTOOL all_targets='$(PHP_MODULES)' -- 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) / configure.in /scripts phpize.m4
janiFri Jul 25 12:36:34 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcconfigure.in /php-src/scriptsphpize.m4 Log: MFH: Fixed a minor problem in not enabling c++/g++ when not needed. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.24&r2=1.579.2.52.2.77.2.25&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.24 php-src/configure.in:1.579.2.52.2.77.2.25 --- php-src/configure.in:1.579.2.52.2.77.2.24 Mon Jul 21 10:17:36 2008 +++ php-src/configure.inFri Jul 25 12:36:34 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.24 2008/07/21 10:17:36 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.25 2008/07/25 12:36:34 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1340,10 +1340,14 @@ LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" -dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) -dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler -AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) -AC_DEFUN([AC_PROG_CXX], [])]) +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). +dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ + undefine([AC_PROG_CXX]) + AC_DEFUN([AC_PROG_CXX], []) + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], []) +]) AC_PROG_LIBTOOL if test "$enable_debug" != "yes"; then http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5&r2=1.17.2.3.2.5.2.1&diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5 php-src/scripts/phpize.m4:1.17.2.3.2.5.2.1 --- php-src/scripts/phpize.m4:1.17.2.3.2.5 Tue Aug 14 08:43:41 2007 +++ php-src/scripts/phpize.m4 Fri Jul 25 12:36:34 2008 @@ -70,10 +70,14 @@ enable_static=no enable_shared=yes -dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) -dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler -AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) -AC_DEFUN([AC_PROG_CXX], [])]) +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). +dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ + undefine([AC_PROG_CXX]) + AC_DEFUN([AC_PROG_CXX], []) + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], []) +]) AC_PROG_LIBTOOL all_targets='$(PHP_MODULES)' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in /scripts phpize.m4
janiFri Jul 25 12:34:55 2008 UTC Modified files: /php-srcconfigure.in /php-src/scriptsphpize.m4 Log: - Fixed a minor problem in not enabling c++/g++ when not needed. http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.661&r2=1.662&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.661 php-src/configure.in:1.662 --- php-src/configure.in:1.661 Mon Jul 21 10:16:32 2008 +++ php-src/configure.inFri Jul 25 12:34:54 2008 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.661 2008/07/21 10:16:32 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.662 2008/07/25 12:34:54 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1254,10 +1254,14 @@ LDFLAGS="$LDFLAGS $PHP_AIX_LDFLAGS" -dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) -dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler -AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) -AC_DEFUN([AC_PROG_CXX], [])]) +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). +dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ + undefine([AC_PROG_CXX]) + AC_DEFUN([AC_PROG_CXX], []) + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], []) +]) AC_PROG_LIBTOOL if test "$enable_debug" != "yes"; then http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.26&r2=1.27&diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.26 php-src/scripts/phpize.m4:1.27 --- php-src/scripts/phpize.m4:1.26 Tue Aug 14 08:43:13 2007 +++ php-src/scripts/phpize.m4 Fri Jul 25 12:34:55 2008 @@ -70,10 +70,14 @@ enable_static=no enable_shared=yes -dnl Only allow AC_PROG_CXX if it's explicitly called (by PHP_REQUIRE_CXX) -dnl otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler -AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [AC_PROG_CXX], [undefine([AC_PROG_CXX]) -AC_DEFUN([AC_PROG_CXX], [])]) +dnl Only allow AC_PROG_CXX and AC_PROG_CXXCPP if they are explicitly called (by PHP_REQUIRE_CXX). +dnl Otherwise AC_PROG_LIBTOOL fails if there is no working C++ compiler. +AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [], [ + undefine([AC_PROG_CXX]) + AC_DEFUN([AC_PROG_CXX], []) + undefine([AC_PROG_CXXCPP]) + AC_DEFUN([AC_PROG_CXXCPP], []) +]) AC_PROG_LIBTOOL all_targets='$(PHP_MODULES)' -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main main.c
felipe Fri Jul 25 12:14:36 2008 UTC
Modified files:
/php-src/main main.c
Log:
- MFB: New parameter parsing API (set_time_limit)
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.773&r2=1.774&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.773 php-src/main/main.c:1.774
--- php-src/main/main.c:1.773 Mon Jul 21 09:36:21 2008
+++ php-src/main/main.c Fri Jul 25 12:14:36 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.773 2008/07/21 09:36:21 bjori Exp $ */
+/* $Id: main.c,v 1.774 2008/07/25 12:14:36 felipe Exp $ */
/* {{{ includes
*/
@@ -1122,8 +1122,8 @@
{
zval **new_timeout;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &new_timeout) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &new_timeout)
== FAILURE) {
+ return;
}
convert_to_string_ex(new_timeout);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 config.m4
janiFri Jul 25 12:04:54 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3config.m4 Log: - Fix description http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/sqlite3/config.m4 diff -u php-src/ext/sqlite3/config.m4:1.1.2.2 php-src/ext/sqlite3/config.m4:1.1.2.3 --- php-src/ext/sqlite3/config.m4:1.1.2.2 Fri Jul 25 12:01:47 2008 +++ php-src/ext/sqlite3/config.m4 Fri Jul 25 12:04:54 2008 @@ -1,10 +1,10 @@ -dnl $Id: config.m4,v 1.1.2.2 2008/07/25 12:01:47 jani Exp $ +dnl $Id: config.m4,v 1.1.2.3 2008/07/25 12:04:54 jani Exp $ dnl config.m4 for extension sqlite3 dnl vim:et:ts=2:sw=2 PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension, -[ --with-sqlite3[=DIR] Enables the SQLite3 extension. DIR is the prefix to -SQLite3 installation directory.], no) +[ --with-sqlite3[=DIR]Include SQLite3 support. DIR is the prefix to + SQLite3 installation directory.], no) if test $PHP_SQLITE3 != "no"; then sqlite3_extra_sources="" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 config.m4
janiFri Jul 25 12:01:48 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3config.m4 Log: - No tabs, fix indent in configure --help http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/config.m4?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/sqlite3/config.m4 diff -u php-src/ext/sqlite3/config.m4:1.1.2.1 php-src/ext/sqlite3/config.m4:1.1.2.2 --- php-src/ext/sqlite3/config.m4:1.1.2.1 Fri Jul 25 02:44:57 2008 +++ php-src/ext/sqlite3/config.m4 Fri Jul 25 12:01:47 2008 @@ -1,5 +1,10 @@ +dnl $Id: config.m4,v 1.1.2.2 2008/07/25 12:01:47 jani Exp $ +dnl config.m4 for extension sqlite3 +dnl vim:et:ts=2:sw=2 + PHP_ARG_WITH(sqlite3, whether to enable the SQLite3 extension, -[ --with-sqlite3[=DIR] Enables the SQLite3 extension. DIR is the prefix to SQLite3 installation directory.], no) +[ --with-sqlite3[=DIR] Enables the SQLite3 extension. DIR is the prefix to +SQLite3 installation directory.], no) if test $PHP_SQLITE3 != "no"; then sqlite3_extra_sources="" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fileinfo fileinfo.c
felipe Fri Jul 25 11:54:06 2008 UTC
Modified files:
/php-src/ext/fileinfo fileinfo.c
Log:
- Fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.21
php-src/ext/fileinfo/fileinfo.c:1.22
--- php-src/ext/fileinfo/fileinfo.c:1.21Fri Jul 25 09:16:09 2008
+++ php-src/ext/fileinfo/fileinfo.c Fri Jul 25 11:54:06 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fileinfo.c,v 1.21 2008/07/25 09:16:09 jani Exp $ */
+/* $Id: fileinfo.c,v 1.22 2008/07/25 11:54:06 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -267,7 +267,7 @@
}
file = resolved_path;
- if ((PG(safe_mode) && (!php_checkuid(file, NULL,
CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(file TSRMLS_CC)) {
+ if (php_check_open_basedir(file TSRMLS_CC)) {
RETURN_FALSE;
}
}
--
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/mbstring mbstring.c mbstring.h
I overlooked one more error; I wrote --SKIP-- everywhere --SKIPIF-- is expected :/ I committed the fix and now it should be ok ;) Moriyoshi On 2008/07/25, at 19:47, Antony Dovgal wrote: On 25.07.2008 14:36, Moriyoshi Koizumi wrote: ini_set() returns the previously set value, so that's fine. But I eventually noticed that the logic is inversed - "or" should be "and" actually. Thanks for the heads-up. The tests still fail, though. Even with zend multibyte enabled. -- ext/mbstring/tests/zend_multibyte-02.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "836583588367" -- ext/mbstring/tests/zend_multibyte-03.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "a5c6a5b9a5c8" -- ext/mbstring/tests/zend_multibyte-04.diff -- 001+ string(12) "836583588367" 001- string(18) "e38386e382b9e38388" -- ext/mbstring/tests/zend_multibyte-05.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(16) "3f3f3fe9b4bb3f3f" -- ext/mbstring/tests/zend_multibyte-06.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "836583588367" -- ext/mbstring/tests/zend_multibyte-07.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "a5c6a5b9a5c8" -- ext/mbstring/tests/zend_multibyte-08.diff -- 001+ string(12) "836583588367" 001- string(18) "e38386e382b9e38388" -- ext/mbstring/tests/zend_multibyte-09.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(16) "3f3f3fe9b4bb3f3f" -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring/tests mb_convert_encoding_basic.phpt mb_encode_mimeheader_basic.phpt mb_encode_mimeheader_variation1.phpt mb_encode_mimeheader_variation2.phpt mb_encode_m
moriyoshi Fri Jul 25 10:48:21 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring/tests mb_convert_encoding_basic.phpt mb_encode_mimeheader_basic.phpt mb_encode_mimeheader_variation1.phpt mb_encode_mimeheader_variation2.phpt mb_encode_mimeheader_variation3.phpt mb_encode_mimeheader_variation4.phpt mb_encode_mimeheader_variation5.phpt mb_encode_mimeheader_variation6.phpt mb_ereg_basic.phpt mb_ereg_variation1.phpt mb_ereg_variation3.phpt mb_ereg_variation4.phpt mb_ereg_variation5.phpt mb_ereg_variation6.phpt mb_ereg_variation7.phpt mb_internal_encoding_variation1.phpt mb_internal_encoding_variation2.phpt mb_regex_encoding_variation1.phpt mb_strlen_variation1.phpt mb_strlen_variation2.phpt mb_strlen_variation3.phpt mb_strpos_basic.phpt mb_strpos_variation1.phpt mb_strpos_variation2.phpt mb_strpos_variation3.phpt mb_strpos_variation4.phpt mb_strrpos_error1.phpt mb_strrpos_error2.phpt mb_strrpos_variation1.phpt mb_strrpos_variation2.phpt mb_strrpos_variation4.phpt mb_strrpos_variation5.phpt mb_strtolower_basic.phpt mb_strtolower_error1.phpt mb_strtolower_variation1.phpt mb_strtolower_variation3.phpt mb_strtolower_variation4.phpt mb_strtoupper_basic.phpt mb_strtoupper_error1.phpt mb_strtoupper_error2.phpt mb_strtoupper_variation1.phpt mb_strtoupper_variation3.phpt mb_strtoupper_variation4.phpt mb_substr_basic.phpt mb_substr_count_basic.phpt mb_substr_count_error1.phpt mb_substr_count_error2.phpt mb_substr_count_variation2.phpt mb_substr_count_variation3.phpt mb_substr_variation1.phpt mb_substr_variation2.phpt mb_substr_variation3.phpt mb_substr_variation4.phpt mb_substr_variation5.phpt zend_multibyte-02.phpt zend_multibyte-03.phpt zend_multibyte-04.phpt zend_multibyte-05.phpt zend_multibyte-06.phpt zend_multibyte-07.phpt zend_multibyte-08.phpt zend_multibyte-09.phpt zend_multibyte-10.phpt zend_multibyte-11.phpt zend_multibyte-12.phpt Log: - Fix tests. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt diff -u php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt:1.1.4.2 php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt:1.1.4.3 --- php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt:1.1.4.2 Fri Feb 1 15:29:59 2008 +++ php-src/ext/mbstring/tests/mb_convert_encoding_basic.phpt Fri Jul 25 10:48:20 2008 @@ -92,4 +92,4 @@ string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" string(72) "5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=" -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_encode_mimeheader_basic.phpt?r1=1.1.4.2&r2=1.1.4.3&d
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c mbstring.h
On 25.07.2008 14:36, Moriyoshi Koizumi wrote: ini_set() returns the previously set value, so that's fine. But I eventually noticed that the logic is inversed - "or" should be "and" actually. Thanks for the heads-up. The tests still fail, though. Even with zend multibyte enabled. -- ext/mbstring/tests/zend_multibyte-02.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "836583588367" -- ext/mbstring/tests/zend_multibyte-03.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "a5c6a5b9a5c8" -- ext/mbstring/tests/zend_multibyte-04.diff -- 001+ string(12) "836583588367" 001- string(18) "e38386e382b9e38388" -- ext/mbstring/tests/zend_multibyte-05.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(16) "3f3f3fe9b4bb3f3f" -- ext/mbstring/tests/zend_multibyte-06.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "836583588367" -- ext/mbstring/tests/zend_multibyte-07.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "a5c6a5b9a5c8" -- ext/mbstring/tests/zend_multibyte-08.diff -- 001+ string(12) "836583588367" 001- string(18) "e38386e382b9e38388" -- ext/mbstring/tests/zend_multibyte-09.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(16) "3f3f3fe9b4bb3f3f" -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c mbstring.h
On 2008/07/25, at 19:11, Antony Dovgal wrote: On 25.07.2008 13:51, Moriyoshi Koizumi wrote: It's probable that segfaults occurred in the test 10, 11 and 12. would you mind posting it if that's the case? No, there are no segfaults and valgrind keeps silence, too. It seems I found it: --SKIP-- Note that "***" instead of SJIS. ini_set() returns the previously set value, so that's fine. But I eventually noticed that the logic is inversed - "or" should be "and" actually. Thanks for the heads-up. Moriyoshi -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c mbstring.h
On 25.07.2008 13:51, Moriyoshi Koizumi wrote: It's probable that segfaults occurred in the test 10, 11 and 12. would you mind posting it if that's the case? No, there are no segfaults and valgrind keeps silence, too. It seems I found it: --SKIP-- Note that "***" instead of SJIS. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c mbstring.h
It's probable that segfaults occurred in the test 10, 11 and 12. would you mind posting it if that's the case? Moriyoshi On 2008/07/25, at 18:51, Antony Dovgal wrote: On 25.07.2008 13:29, Moriyoshi Koizumi wrote: Can you send me the test results? I tested on PPC and i386, and they went well without problems. I'm testing on Linux 64bit. Here are the diffs. -- ext/mbstring/tests/zend_multibyte-02.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "836583588367" -- ext/mbstring/tests/zend_multibyte-03.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "a5c6a5b9a5c8" -- ext/mbstring/tests/zend_multibyte-04.diff -- 001+ string(12) "836583588367" 001- string(18) "e38386e382b9e38388" -- ext/mbstring/tests/zend_multibyte-05.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(16) "3f3f3fe9b4bb3f3f" -- ext/mbstring/tests/zend_multibyte-06.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "836583588367" -- ext/mbstring/tests/zend_multibyte-07.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "a5c6a5b9a5c8" -- ext/mbstring/tests/zend_multibyte-08.diff -- 001+ string(12) "836583588367" 001- string(18) "e38386e382b9e38388" -- ext/mbstring/tests/zend_multibyte-09.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(16) "3f3f3fe9b4bb3f3f" -- ext/mbstring/tests/zend_multibyte-10.diff -- 001+ 001- Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line 3 -- ext/mbstring/tests/zend_multibyte-11.diff -- 001+ 001- Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line 3 -- ext/mbstring/tests/zend_multibyte-12.diff -- 001+ 1 001- Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line 4 -- 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 / run-tests.php
tony2001Fri Jul 25 09:55:51 2008 UTC Modified files: /php-srcrun-tests.php Log: fix typo http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.370&r2=1.371&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.370 php-src/run-tests.php:1.371 --- php-src/run-tests.php:1.370 Fri Jul 25 09:32:06 2008 +++ php-src/run-tests.php Fri Jul 25 09:55:51 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.370 2008/07/25 09:32:06 moriyoshi Exp $ */ +/* $Id: run-tests.php,v 1.371 2008/07/25 09:55:51 tony2001 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 @@ -426,7 +426,7 @@ $output_file = 'compress.zlib://' . $output_file . '.gz'; } -$jnust_save_results = false; +$just_save_results = false; $leak_check = false; $html_output = false; $html_file = null; @@ -608,7 +608,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.370 $' . "\n"; + echo '$Revision: 1.371 $' . "\n"; exit(1); default: -- 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
tony2001Fri Jul 25 09:55:45 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: fix typo http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.39&r2=1.226.2.37.2.35.2.40&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.39 php-src/run-tests.php:1.226.2.37.2.35.2.40 --- php-src/run-tests.php:1.226.2.37.2.35.2.39 Fri Jul 25 09:32:23 2008 +++ php-src/run-tests.php Fri Jul 25 09:55:45 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.39 2008/07/25 09:32:23 moriyoshi Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.40 2008/07/25 09:55:45 tony2001 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 @@ -426,7 +426,7 @@ $output_file = 'compress.zlib://' . $output_file . '.gz'; } -$jnust_save_results = false; +$just_save_results = false; $leak_check = false; $html_output = false; $html_file = null; @@ -608,7 +608,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.39 $' . "\n"; + echo '$Revision: 1.226.2.37.2.35.2.40 $' . "\n"; exit(1); default: -- 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/mbstring mbstring.c mbstring.h
On 25.07.2008 13:29, Moriyoshi Koizumi wrote: Can you send me the test results? I tested on PPC and i386, and they went well without problems. I'm testing on Linux 64bit. Here are the diffs. -- ext/mbstring/tests/zend_multibyte-02.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "836583588367" -- ext/mbstring/tests/zend_multibyte-03.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "a5c6a5b9a5c8" -- ext/mbstring/tests/zend_multibyte-04.diff -- 001+ string(12) "836583588367" 001- string(18) "e38386e382b9e38388" -- ext/mbstring/tests/zend_multibyte-05.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(16) "3f3f3fe9b4bb3f3f" -- ext/mbstring/tests/zend_multibyte-06.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "836583588367" -- ext/mbstring/tests/zend_multibyte-07.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(12) "a5c6a5b9a5c8" -- ext/mbstring/tests/zend_multibyte-08.diff -- 001+ string(12) "836583588367" 001- string(18) "e38386e382b9e38388" -- ext/mbstring/tests/zend_multibyte-09.diff -- 001+ string(18) "e38386e382b9e38388" 001- string(16) "3f3f3fe9b4bb3f3f" -- ext/mbstring/tests/zend_multibyte-10.diff -- 001+ 001- Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line 3 -- ext/mbstring/tests/zend_multibyte-11.diff -- 001+ 001- Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line 3 -- ext/mbstring/tests/zend_multibyte-12.diff -- 001+ 1 001- Fatal error: Encoding declaration pragma must be the very first statement in the script in %s on line 4 -- 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/pdo pdo_stmt.c /ext/reflection php_reflection.c
dmitry Fri Jul 25 09:48:36 2008 UTC
Modified files:
/php-src/ext/pdopdo_stmt.c
/php-src/ext/reflection php_reflection.c
Log:
Fixed support for static methods
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.195&r2=1.196&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.195 php-src/ext/pdo/pdo_stmt.c:1.196
--- php-src/ext/pdo/pdo_stmt.c:1.195Fri Jul 25 08:53:11 2008
+++ php-src/ext/pdo/pdo_stmt.c Fri Jul 25 09:48:36 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.195 2008/07/25 08:53:11 dmitry Exp $ */
+/* $Id: pdo_stmt.c,v 1.196 2008/07/25 09:48:36 dmitry Exp $ */
/* The PDO Statement Handle Class */
@@ -850,7 +850,7 @@
fcc->initialized = 1;
fcc->function_handler = function_handler;
fcc->calling_scope = EG(scope);
- fcc->called_scope = Z_OBJCE_PP(object);
+ fcc->called_scope = object ? Z_OBJCE_PP(object) : NULL;
fcc->object_pp = object;
return 1;
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.302&r2=1.303&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.302
php-src/ext/reflection/php_reflection.c:1.303
--- php-src/ext/reflection/php_reflection.c:1.302 Fri Jul 25 08:53:11 2008
+++ php-src/ext/reflection/php_reflection.c Fri Jul 25 09:48:36 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.302 2008/07/25 08:53:11 dmitry Exp $ */
+/* $Id: php_reflection.c,v 1.303 2008/07/25 09:48:36 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2434,7 +2434,7 @@
*/
if (mptr->common.fn_flags & ZEND_ACC_STATIC) {
object_pp = NULL;
- obj_ce = NULL;
+ obj_ce = mptr->common.scope;
} else {
if ((Z_TYPE_PP(params[0]) != IS_OBJECT)) {
efree(params);
@@ -2465,7 +2465,7 @@
fcc.initialized = 1;
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
- fcc.called_scope = Z_OBJCE_PP(object_pp);
+ fcc.called_scope = obj_ce;
fcc.object_pp = object_pp;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -2538,7 +2538,7 @@
*/
if (mptr->common.fn_flags & ZEND_ACC_STATIC) {
object = NULL;
- obj_ce = NULL;
+ obj_ce = mptr->common.scope;
} else {
if (!object) {
efree(params);
@@ -2570,8 +2570,8 @@
fcc.initialized = 1;
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
- fcc.called_scope = Z_OBJCE_P(object);
- fcc.object_pp = &object;
+ fcc.called_scope = obj_ce;
+ fcc.object_pp = object ? &object : NULL;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -5259,7 +5259,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.302
2008/07/25 08:53:11 dmitry Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.303
2008/07/25 09:48:36 dmitry Exp $");
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c /ext/reflection php_reflection.c
dmitry Fri Jul 25 09:44:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_stmt.c
/php-src/ext/reflection php_reflection.c
Log:
Fixed support for static methods
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.19&r2=1.118.2.38.2.24.2.20&diff_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.19
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.20
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.19 Fri Jul 25 08:45:09 2008
+++ php-src/ext/pdo/pdo_stmt.c Fri Jul 25 09:44:47 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.19 2008/07/25 08:45:09 tony2001 Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.20 2008/07/25 09:44:47 dmitry Exp $ */
/* The PDO Statement Handle Class */
@@ -860,7 +860,7 @@
fcc->initialized = 1;
fcc->function_handler = function_handler;
fcc->calling_scope = EG(scope);
- fcc->called_scope = Z_OBJCE_PP(object);
+ fcc->called_scope = object ? Z_OBJCE_PP(object) : NULL;
fcc->object_pp = object;
return 1;
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.24&r2=1.164.2.33.2.45.2.25&diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.24
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.25
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.24Fri Jul
25 08:50:55 2008
+++ php-src/ext/reflection/php_reflection.c Fri Jul 25 09:44:47 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.24 2008/07/25 08:50:55 dmitry Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.25 2008/07/25 09:44:47 dmitry Exp
$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2382,7 +2382,7 @@
*/
if (mptr->common.fn_flags & ZEND_ACC_STATIC) {
object_pp = NULL;
- obj_ce = NULL;
+ obj_ce = mptr->common.scope;
} else {
if (Z_TYPE_PP(params[0]) != IS_OBJECT) {
efree(params);
@@ -2416,7 +2416,7 @@
fcc.initialized = 1;
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
- fcc.called_scope = Z_OBJCE_PP(object_pp);
+ fcc.called_scope = obj_ce;
fcc.object_pp = object_pp;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -2491,7 +2491,7 @@
*/
if (mptr->common.fn_flags & ZEND_ACC_STATIC) {
object = NULL;
- obj_ce = NULL;
+ obj_ce = mptr->common.scope;
} else {
if (!object) {
efree(params);
@@ -2523,8 +2523,8 @@
fcc.initialized = 1;
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
- fcc.called_scope = Z_OBJCE_P(object);
- fcc.object_pp = &object;
+ fcc.called_scope = obj_ce;
+ fcc.object_pp = object ? &object : NULL;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
@@ -5117,7 +5117,7 @@
php_info_print_table_start();
php_info_print_table_header(2, "Reflection", "enabled");
- php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.45.2.24 2008/07/25 08:50:55 dmitry Exp $");
+ php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v
1.164.2.33.2.45.2.25 2008/07/25 09:44:47 dmitry Exp $");
php_info_print_table_end();
} /* }}} */
--
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/mbstring mbstring.c mbstring.h
Can you send me the test results? I tested on PPC and i386, and they went well without problems. Moriyoshi On 2008/07/25, at 16:09, Antony Dovgal wrote: On 25.07.2008 02:21, Moriyoshi Koizumi wrote: moriyoshi Thu Jul 24 22:21:42 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/mbstring/tests zend_multibyte-01.phpt zend_multibyte-02.phpt zend_multibyte-03.phpt zend_multibyte-04.phpt zend_multibyte-05.phpt zend_multibyte-06.phpt zend_multibyte-07.phpt zend_multibyte-08.phpt zend_multibyte-09.phpt zend_multibyte-10.phpt zend_multibyte-11.phpt zend_multibyte-12.phpt All of these tests fail (except for the first one). -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
moriyoshi Fri Jul 25 09:32:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
- MFH: Allow the results of a partial run to be saved when -s option is
explicitly specified.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.38&r2=1.226.2.37.2.35.2.39&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.38
php-src/run-tests.php:1.226.2.37.2.35.2.39
--- php-src/run-tests.php:1.226.2.37.2.35.2.38 Wed Jul 23 16:11:00 2008
+++ php-src/run-tests.php Fri Jul 25 09:32:23 2008
@@ -24,12 +24,13 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.38 2008/07/23 16:11:00 lstrojny Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.39 2008/07/25 09:32:23 moriyoshi 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
* not run without it.
*/
+
if (!extension_loaded('pcre')) {
echo <
[PHP-CVS] cvs: php-src / run-tests.php
moriyoshi Fri Jul 25 09:32:07 2008 UTC
Modified files:
/php-srcrun-tests.php
Log:
- Allow the results of a partial run to be saved when -s option is explicitly
specified.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.369&r2=1.370&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.369 php-src/run-tests.php:1.370
--- php-src/run-tests.php:1.369 Thu Jul 24 21:39:23 2008
+++ php-src/run-tests.php Fri Jul 25 09:32:06 2008
@@ -24,12 +24,13 @@
+--+
*/
-/* $Id: run-tests.php,v 1.369 2008/07/24 21:39:23 jani Exp $ */
+/* $Id: run-tests.php,v 1.370 2008/07/25 09:32:06 moriyoshi 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
* not run without it.
*/
+
if (!extension_loaded('pcre')) {
echo <
[PHP-CVS] cvs: php-src /ext/standard url_scanner_ex.c
janiFri Jul 25 09:17:53 2008 UTC
Modified files:
/php-src/ext/standard url_scanner_ex.c
Log:
MFB: generated with a bit newer re2c
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url_scanner_ex.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/standard/url_scanner_ex.c
diff -u php-src/ext/standard/url_scanner_ex.c:1.109
php-src/ext/standard/url_scanner_ex.c:1.110
--- php-src/ext/standard/url_scanner_ex.c:1.109 Wed Mar 12 02:45:15 2008
+++ php-src/ext/standard/url_scanner_ex.c Fri Jul 25 09:17:52 2008
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.12.1 on Wed Oct 10 12:27:56 2007 */
+/* Generated by re2c 0.13.5 on Mon Jul 21 16:04:35 2008 */
#line 1 "ext/standard/url_scanner_ex.re"
/*
+--+
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: url_scanner_ex.c,v 1.109 2008/03/12 02:45:15 felipe Exp $ */
+/* $Id: url_scanner_ex.c,v 1.110 2008/07/25 09:17:52 jani Exp $ */
#include "php.h"
@@ -109,7 +109,10 @@
q = (p = url->c) + url->len;
scan:
+
+#line 114 "ext/standard/url_scanner_ex.c"
{
+ YYCTYPE yych;
static const unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
@@ -145,42 +148,37 @@
128, 128, 128, 128, 128, 128, 128, 128,
};
-#line 149 "ext/standard/url_scanner_ex.c"
- {
- YYCTYPE yych;
-
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
- goto yy8;
- }
- if(yych <= '9') goto yy6;
- if(yych >= ';') goto yy4;
- ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy8;
+ }
+ if (yych <= '9') goto yy6;
+ if (yych >= ';') goto yy4;
+ ++YYCURSOR;
#line 116 "ext/standard/url_scanner_ex.re"
- { smart_str_append(dest, url); return; }
-#line 163 "ext/standard/url_scanner_ex.c"
+ { smart_str_append(dest, url); return; }
+#line 162 "ext/standard/url_scanner_ex.c"
yy4:
- ++YYCURSOR;
+ ++YYCURSOR;
#line 117 "ext/standard/url_scanner_ex.re"
- { sep = separator; goto scan; }
-#line 168 "ext/standard/url_scanner_ex.c"
+ { sep = separator; goto scan; }
+#line 167 "ext/standard/url_scanner_ex.c"
yy6:
- ++YYCURSOR;
+ ++YYCURSOR;
#line 118 "ext/standard/url_scanner_ex.re"
- { bash = p - 1; goto done; }
-#line 173 "ext/standard/url_scanner_ex.c"
+ { bash = p - 1; goto done; }
+#line 172 "ext/standard/url_scanner_ex.c"
yy8:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
- goto yy8;
- }
-#line 119 "ext/standard/url_scanner_ex.re"
- { goto scan; }
-#line 183 "ext/standard/url_scanner_ex.c"
+ ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy8;
}
+#line 119 "ext/standard/url_scanner_ex.re"
+ { goto scan; }
+#line 182 "ext/standard/url_scanner_ex.c"
}
#line 120 "ext/standard/url_scanner_ex.re"
@@ -361,7 +359,10 @@
state_plain:
start = YYCURSOR;
+
+#line 364 "ext/standard/url_scanner_ex.c"
{
+ YYCTYPE yych;
static const unsigned char yybm[] = {
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
@@ -396,37 +397,35 @@
128, 128, 128, 128, 128, 128, 128, 128,
128, 128, 128, 128, 128, 128, 128, 128,
};
-
-#line 401 "ext/standard/url_scanner_ex.c"
- {
- YYCTYPE yych;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
- goto yy15;
- }
- ++YYCURSOR;
+ if (YYLIMIT <= YYCURSOR) YYFILL(1);
+ yych = *YYCURSOR;
+ if (yybm[0+yych] & 128) {
+ goto yy15;
+ }
+ ++YYCURSOR;
#line 299 "ext/standard/url_scanner_ex.re"
- { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
-#line 412 "ext/standard/url_scanner_ex.c"
+ { passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
+#line 409 "ext/standard/url_scanner_ex.c"
yy15:
- ++YYCURSOR;
- if(YYLIMIT == YYCURSOR) YYFILL(1);
- yych = *YYCURSOR;
- if(yybm[0+yych] & 128) {
- goto yy15;
- }
-#line 300 "ext/standard/url_scanner_ex.re"
- { passthru(STD_ARGS); goto state_plain; }
-#line 422 "
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/fileinfo Makefile.frag config.m4 fileinfo.c
janiFri Jul 25 09:16:23 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/fileinfo Makefile.frag
Modified files:
/php-src/ext/fileinfo config.m4 fileinfo.c
Log:
MFH: enable fileinfo by default
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.11&r2=1.11.2.1&diff_format=u
Index: php-src/ext/fileinfo/config.m4
diff -u php-src/ext/fileinfo/config.m4:1.11
php-src/ext/fileinfo/config.m4:1.11.2.1
--- php-src/ext/fileinfo/config.m4:1.11 Thu Jul 24 14:22:30 2008
+++ php-src/ext/fileinfo/config.m4 Fri Jul 25 09:16:22 2008
@@ -1,23 +1,10 @@
-dnl $Id: config.m4,v 1.11 2008/07/24 14:22:30 tony2001 Exp $
+dnl $Id: config.m4,v 1.11.2.1 2008/07/25 09:16:22 jani Exp $
dnl config.m4 for extension fileinfo
-PHP_ARG_WITH(fileinfo, for fileinfo support,
-[ --with-fileinfo=DIR Include fileinfo support])
+PHP_ARG_ENABLE(fileinfo, for fileinfo support,
+[ --disable-fileinfo Disable fileinfo support], yes)
if test "$PHP_FILEINFO" != "no"; then
- MAGIC_MIME_DIRS="/usr/local/share/file /usr/share/file /usr/share/misc/file
/etc /usr/share/misc"
- MAGIC_MIME_FILENAMES="magic magic.mime"
-
- for i in $MAGIC_MIME_DIRS; do
-for j in $MAGIC_MIME_FILENAMES; do
- if test -f "$i/$j"; then
-PHP_DEFAULT_MAGIC_FILE="$i/$j"
-break
- fi
-done
- done
-
- AC_DEFINE_UNQUOTED(PHP_DEFAULT_MAGIC_FILE,"$PHP_DEFAULT_MAGIC_FILE",[magic
file path])
libmagic_sources=" \
libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \
@@ -26,8 +13,9 @@
libmagic/readelf.c libmagic/softmagic.c"
PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources,
$ext_shared,,[EMAIL PROTECTED]@/libmagic)
- PHP_SUBST(FILEINFO_SHARED_LIBADD)
PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
AC_CHECK_FUNCS([utimes])
+
+ PHP_ADD_MAKEFILE_FRAGMENT
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.20&r2=1.20.2.1&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.20
php-src/ext/fileinfo/fileinfo.c:1.20.2.1
--- php-src/ext/fileinfo/fileinfo.c:1.20Thu Jul 24 15:07:37 2008
+++ php-src/ext/fileinfo/fileinfo.c Fri Jul 25 09:16:22 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fileinfo.c,v 1.20 2008/07/24 15:07:37 tony2001 Exp $ */
+/* $Id: fileinfo.c,v 1.20.2.1 2008/07/25 09:16:22 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -44,10 +44,6 @@
struct magic_set *magic;
};
-#ifndef PHP_DEFAULT_MAGIC_FILE
-#define PHP_DEFAULT_MAGIC_FILE NULL
-#endif
-
#ifdef ZEND_ENGINE_2
/* {{{ */
static zend_object_handlers finfo_object_handlers;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/Makefile.frag?view=markup&rev=1.1
Index: php-src/ext/fileinfo/Makefile.frag
+++ php-src/ext/fileinfo/Makefile.frag
$(builddir)/libmagic/apprentice.lo: $(srcdir)/data_file.c
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fileinfo Makefile.frag config.m4 fileinfo.c
janiFri Jul 25 09:16:09 2008 UTC
Added files:
/php-src/ext/fileinfo Makefile.frag
Modified files:
/php-src/ext/fileinfo config.m4 fileinfo.c
Log:
- Enable fileinfo by default
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/config.m4?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/fileinfo/config.m4
diff -u php-src/ext/fileinfo/config.m4:1.11 php-src/ext/fileinfo/config.m4:1.12
--- php-src/ext/fileinfo/config.m4:1.11 Thu Jul 24 14:22:30 2008
+++ php-src/ext/fileinfo/config.m4 Fri Jul 25 09:16:09 2008
@@ -1,23 +1,10 @@
-dnl $Id: config.m4,v 1.11 2008/07/24 14:22:30 tony2001 Exp $
+dnl $Id: config.m4,v 1.12 2008/07/25 09:16:09 jani Exp $
dnl config.m4 for extension fileinfo
-PHP_ARG_WITH(fileinfo, for fileinfo support,
-[ --with-fileinfo=DIR Include fileinfo support])
+PHP_ARG_ENABLE(fileinfo, for fileinfo support,
+[ --disable-fileinfo Disable fileinfo support], yes)
if test "$PHP_FILEINFO" != "no"; then
- MAGIC_MIME_DIRS="/usr/local/share/file /usr/share/file /usr/share/misc/file
/etc /usr/share/misc"
- MAGIC_MIME_FILENAMES="magic magic.mime"
-
- for i in $MAGIC_MIME_DIRS; do
-for j in $MAGIC_MIME_FILENAMES; do
- if test -f "$i/$j"; then
-PHP_DEFAULT_MAGIC_FILE="$i/$j"
-break
- fi
-done
- done
-
- AC_DEFINE_UNQUOTED(PHP_DEFAULT_MAGIC_FILE,"$PHP_DEFAULT_MAGIC_FILE",[magic
file path])
libmagic_sources=" \
libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \
@@ -26,8 +13,9 @@
libmagic/readelf.c libmagic/softmagic.c"
PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources,
$ext_shared,,[EMAIL PROTECTED]@/libmagic)
- PHP_SUBST(FILEINFO_SHARED_LIBADD)
PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
AC_CHECK_FUNCS([utimes])
+
+ PHP_ADD_MAKEFILE_FRAGMENT
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/fileinfo.c?r1=1.20&r2=1.21&diff_format=u
Index: php-src/ext/fileinfo/fileinfo.c
diff -u php-src/ext/fileinfo/fileinfo.c:1.20
php-src/ext/fileinfo/fileinfo.c:1.21
--- php-src/ext/fileinfo/fileinfo.c:1.20Thu Jul 24 15:07:37 2008
+++ php-src/ext/fileinfo/fileinfo.c Fri Jul 25 09:16:09 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fileinfo.c,v 1.20 2008/07/24 15:07:37 tony2001 Exp $ */
+/* $Id: fileinfo.c,v 1.21 2008/07/25 09:16:09 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -44,10 +44,6 @@
struct magic_set *magic;
};
-#ifndef PHP_DEFAULT_MAGIC_FILE
-#define PHP_DEFAULT_MAGIC_FILE NULL
-#endif
-
#ifdef ZEND_ENGINE_2
/* {{{ */
static zend_object_handlers finfo_object_handlers;
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/Makefile.frag?view=markup&rev=1.1
Index: php-src/ext/fileinfo/Makefile.frag
+++ php-src/ext/fileinfo/Makefile.frag
$(builddir)/libmagic/apprentice.lo: $(srcdir)/data_file.c
--
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 credits_ext.h
janiFri Jul 25 09:13:24 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard credits_ext.h
Log:
Update credits
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.6.2.6.2.4&r2=1.30.2.6.2.6.2.5&diff_format=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.4
php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.5
--- php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.4 Mon Jul 14 08:57:10 2008
+++ php-src/ext/standard/credits_ext.h Fri Jul 25 09:13:24 2008
@@ -25,6 +25,7 @@
CREDIT_LINE("ereg", "Rasmus Lerdorf, Jim Winstead, Jaakko Hyvätti");
CREDIT_LINE("EXIF", "Rasmus Lerdorf, Marcus Boerger");
CREDIT_LINE("FBSQL", "Frank M. Kromann");
+CREDIT_LINE("fileinfo", "Ilia Alshanetsky, Derick Rethans");
CREDIT_LINE("Firebird/InterBase driver for PDO", "Ard Biesheuvel");
CREDIT_LINE("FTP", "Stefan Esser, Andrew Skalski");
CREDIT_LINE("GD imaging", "Rasmus Lerdorf, Stig Bakken, Jim Winstead, Jouni
Ahto, Ilia Alshanetsky, Pierre-Alain Joye, Marcus Boerger");
@@ -45,7 +46,7 @@
CREDIT_LINE("mSQL", "Zeev Suraski");
CREDIT_LINE("MS SQL", "Frank M. Kromann");
CREDIT_LINE("Multibyte String Functions", "Tsukada Takuya, Rui Hirokawa");
-CREDIT_LINE("mySQL driver for PDO", "George Schlossnagle, Wez Furlong, Ilia
Alshanetsky");
+CREDIT_LINE("MySQL driver for PDO", "George Schlossnagle, Wez Furlong, Ilia
Alshanetsky, Johannes Schlueter");
CREDIT_LINE("MySQLi", "Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel");
CREDIT_LINE("MySQLnd", "Georg Richter, Andrey Hristov, Ulf Wendel");
CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter");
@@ -73,6 +74,7 @@
CREDIT_LINE("SOAP", "Brad Lafountain, Shane Caraveo, Dmitry Stogov");
CREDIT_LINE("Sockets", "Chris Vandomelen, Sterling Hughes, Daniel Beulshausen,
Jason Greene");
CREDIT_LINE("SPL", "Marcus Boerger, Etienne Kneuss");
+CREDIT_LINE("SQLite3", "Scott MacVicar");
CREDIT_LINE("SQLite 3.x driver for PDO", "Wez Furlong");
CREDIT_LINE("SQLite", "Wez Furlong, Tal Peer, Marcus Boerger, Ilia
Alshanetsky");
CREDIT_LINE("Sybase-CT", "Zeev Suraski, Tom May, Timm Friebe");
--
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/gd/tests imageloadfont_invalid.phpt
janiFri Jul 25 09:10:11 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/gd/tests imageloadfont_invalid.phpt Log: MFH: cleanup http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imageloadfont_invalid.phpt?r1=1.1.6.2&r2=1.1.6.3&diff_format=u Index: php-src/ext/gd/tests/imageloadfont_invalid.phpt diff -u php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.1.6.2 php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.1.6.3 --- php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.1.6.2 Thu Jul 17 23:13:09 2008 +++ php-src/ext/gd/tests/imageloadfont_invalid.phpt Fri Jul 25 09:10:11 2008 @@ -17,6 +17,7 @@ $font = imageloadfont($filename); $black = imagecolorallocate($image, 0, 0, 0); imagestring($image, $font, 0, 0, "Hello", $black); +unlink($filename); ?> --EXPECTF-- Warning: imageloadfont(): gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/tests imageloadfont_invalid.phpt
janiFri Jul 25 09:10:02 2008 UTC Modified files: /php-src/ext/gd/tests imageloadfont_invalid.phpt Log: - Cleanup after test http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imageloadfont_invalid.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/gd/tests/imageloadfont_invalid.phpt diff -u php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.2 php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.3 --- php-src/ext/gd/tests/imageloadfont_invalid.phpt:1.2 Thu Jul 17 23:28:11 2008 +++ php-src/ext/gd/tests/imageloadfont_invalid.phpt Fri Jul 25 09:10:02 2008 @@ -17,6 +17,7 @@ $font = imageloadfont($filename); $black = imagecolorallocate($image, 0, 0, 0); imagestring($image, $font, 0, 0, "Hello", $black); +unlink($filename); ?> --EXPECTF-- Warning: imageloadfont(): gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully -- 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 /ext/mysqli mysqli.c /ext/pdo pdo_dbh.c pdo_stmt.c /ext/pgsql pgsql.c /ext/reflection php_reflection.c /ext/spl spl_directory.c /ext/sqlite sqlite.c
dmitry Fri Jul 25 08:53:11 2008 UTC
Modified files:
/ZendEngine2zend_execute_API.c
/php-src/main/streams userspace.c
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/splspl_directory.c
/php-src/ext/sqlite sqlite.c
Log:
Fixed uninitialized data
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.452&r2=1.453&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.452
ZendEngine2/zend_execute_API.c:1.453
--- ZendEngine2/zend_execute_API.c:1.452Thu Jul 24 10:13:59 2008
+++ ZendEngine2/zend_execute_API.c Fri Jul 25 08:53:11 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute_API.c,v 1.452 2008/07/24 10:13:59 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.453 2008/07/25 08:53:11 dmitry Exp $ */
#include
#include
@@ -1380,6 +1380,7 @@
fcall_cache.initialized = EG(autoload_func) ? 1 : 0;
fcall_cache.function_handler = EG(autoload_func);
fcall_cache.calling_scope = NULL;
+ fcall_cache.called_scope = NULL;
fcall_cache.object_pp = NULL;
exception = EG(exception);
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.47&r2=1.48&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.47
php-src/main/streams/userspace.c:1.48
--- php-src/main/streams/userspace.c:1.47 Fri Jul 11 10:24:29 2008
+++ php-src/main/streams/userspace.cFri Jul 25 08:53:11 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.47 2008/07/11 10:24:29 tony2001 Exp $ */
+/* $Id: userspace.c,v 1.48 2008/07/25 08:53:11 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -262,6 +262,7 @@
fcc.initialized = 1;
fcc.function_handler = uwrap->ce->constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(us->object);
fcc.object_pp = &us->object;
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.263&r2=1.264&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.263 php-src/ext/mysql/php_mysql.c:1.264
--- php-src/ext/mysql/php_mysql.c:1.263 Tue Jul 22 23:43:14 2008
+++ php-src/ext/mysql/php_mysql.c Fri Jul 25 08:53:11 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.263 2008/07/22 23:43:14 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.264 2008/07/25 08:53:11 dmitry Exp $ */
/* TODO:
*
@@ -2209,6 +2209,7 @@
fcc.initialized = 1;
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(return_value);
fcc.object_pp = &return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.131&r2=1.132&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.131 php-src/ext/mysqli/mysqli.c:1.132
--- php-src/ext/mysqli/mysqli.c:1.131 Mon Jul 21 13:01:41 2008
+++ php-src/ext/mysqli/mysqli.c Fri Jul 25 08:53:11 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli.c,v 1.131 2008/07/21 13:01:41 andrey Exp $
+ $Id: mysqli.c,v 1.132 2008/07/25 08:53:11 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1343,6 +1343,7 @@
fcc.initialized = 1;
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(return_value);
fcc.object_pp = &return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.150&r2=1.151&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.150 php-src/ext/pdo/pdo_dbh.c:1.151
--- php-src/ext/pdo/pdo_dbh.c:1.150 Mon Mar 10 14:35:37 2008
+++ php-src/ext/pdo/pdo_dbh.c Fri Jul 25 08:53:11 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.150 2008/03/10 14:35:37 gwynne Exp $ */
+/* $Id: pdo_dbh.c,v 1.151 2008/07/25 08:53:11 dmitry Exp $ */
/* The PDO Database Handle Class
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c
dmitry Fri Jul 25 08:50:55 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/reflection php_reflection.c Log: Fixed uninitialized data http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.23&r2=1.164.2.33.2.45.2.24&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.23 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.24 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.23Fri Jul 25 08:45:09 2008 +++ php-src/ext/reflection/php_reflection.c Fri Jul 25 08:50:55 2008 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.23 2008/07/25 08:45:09 tony2001 Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.24 2008/07/25 08:50:55 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1235,7 +1235,7 @@ fcc.initialized = 1; fcc.function_handler = ce_ptr->constructor; fcc.calling_scope = ce_ptr; - fcc.called_scope = reflection_ptr; + fcc.called_scope = Z_OBJCE_P(reflector_ptr); fcc.object_pp = &reflector_ptr; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -5117,7 +5117,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.23 2008/07/25 08:45:09 tony2001 Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.24 2008/07/25 08:50:55 dmitry Exp $"); php_info_print_table_end(); } /* }}} */ -- 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/ming ming.c php_ming.h
On Thu, 24 Jul 2008, Frank M. Kromann wrote: > fmk Thu Jul 24 08:02:39 2008 UTC > > Modified files: (Branch: PHP_5_3) > /php-src/ext/ming ming.c php_ming.h > Log: > Syncronize the ming extension with libming 0.4 > [DOC] PHP 5.3 requires libming 0.4 Is that really necessary? libming 0.3 has been working fine, and it's the latest that debian unstable has - could you please see if it'd be possible to support that as well? regards, Derick -- HEAD before 5_3!: http://tinyurl.com/6d2esb http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo pdo_stmt.c /ext/reflection php_reflection.c
tony2001Fri Jul 25 08:45:09 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/pdopdo_stmt.c /php-src/ext/reflection php_reflection.c Log: fix typos http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.24.2.18&r2=1.118.2.38.2.24.2.19&diff_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.18 php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.19 --- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24.2.18 Fri Jul 25 08:23:06 2008 +++ php-src/ext/pdo/pdo_stmt.c Fri Jul 25 08:45:09 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.18 2008/07/25 08:23:06 dmitry Exp $ */ +/* $Id: pdo_stmt.c,v 1.118.2.38.2.24.2.19 2008/07/25 08:45:09 tony2001 Exp $ */ /* The PDO Statement Handle Class */ @@ -860,7 +860,7 @@ fcc->initialized = 1; fcc->function_handler = function_handler; fcc->calling_scope = EG(scope); - fcc->called_scope = Z_OBJCE_P(object); + fcc->called_scope = Z_OBJCE_PP(object); fcc->object_pp = object; return 1; http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.22&r2=1.164.2.33.2.45.2.23&diff_format=u Index: php-src/ext/reflection/php_reflection.c diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.22 php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.23 --- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.22Fri Jul 25 08:23:07 2008 +++ php-src/ext/reflection/php_reflection.c Fri Jul 25 08:45:09 2008 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.22 2008/07/25 08:23:07 dmitry Exp $ */ +/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.23 2008/07/25 08:45:09 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1235,7 +1235,7 @@ fcc.initialized = 1; fcc.function_handler = ce_ptr->constructor; fcc.calling_scope = ce_ptr; - fcc.called_scope = Z_OBJCE_P(reflection_ptr); + fcc.called_scope = reflection_ptr; fcc.object_pp = &reflector_ptr; result = zend_call_function(&fci, &fcc TSRMLS_CC); @@ -5117,7 +5117,7 @@ php_info_print_table_start(); php_info_print_table_header(2, "Reflection", "enabled"); - php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.22 2008/07/25 08:23:07 dmitry Exp $"); + php_info_print_table_row(2, "Version", "$Id: php_reflection.c,v 1.164.2.33.2.45.2.23 2008/07/25 08:45:09 tony2001 Exp $"); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Fri Jul 25 08:39:23 2008 UTC Modified files: /CVSROOTavail Log: - No more commits through pecl for fileinfo. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1427&r2=1.1428&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1427 CVSROOT/avail:1.1428 --- CVSROOT/avail:1.1427Thu Jul 24 21:54:21 2008 +++ CVSROOT/avail Fri Jul 25 08:39:23 2008 @@ -318,6 +318,9 @@ unavail||pdo-specs avail|wez,andi,stas,iliaa|pdo-specs +# preventing symlinked exts from being committed to in PECL +unavail||pecl/fileinfo + # preprocessor karma avail|merlin|pecl/preprocessor -- 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/standard http_fopen_wrapper.c
mikeFri Jul 25 08:27:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/standard http_fopen_wrapper.c
Log:
- Changed HTTP stream wrapper to accept any code between and including
200 to 399 as successful. (patch by Noah Fontes)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.221&r2=1.2027.2.547.2.965.2.222&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.221
php-src/NEWS:1.2027.2.547.2.965.2.222
--- php-src/NEWS:1.2027.2.547.2.965.2.221 Fri Jul 25 04:54:08 2008
+++ php-src/NEWSFri Jul 25 08:27:37 2008
@@ -16,6 +16,8 @@
- Changed PCRE, SPL and reflection extensions to always be enabled. (Marcus)
- Changed md5() to use improved implementation. (Solar Designer, Dmitry)
- Changed mhash to be a wrapper layer around the hash extension. (Scott)
+- Changed HTTP stream wrapper to accept any code between and including
+ 200 to 399 as successful. (Mike, Noah Fontes)
- Improved PHP syntax and semantics:
. Added lambda functions and closures (Christian Seiler, Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.12.2.9.2.8&r2=1.99.2.12.2.9.2.9&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.8
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.9
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.12.2.9.2.8 Fri Jul 11
10:25:15 2008
+++ php-src/ext/standard/http_fopen_wrapper.c Fri Jul 25 08:27:37 2008
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.8 2008/07/11 10:25:15 tony2001
Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.99.2.12.2.9.2.9 2008/07/25 08:27:37 mike Exp
$ */
#include "php.h"
#include "php_globals.h"
@@ -529,25 +529,25 @@
(context &&
php_stream_context_get_option(context, "http", "ignore_errors", &tmpzval) ==
SUCCESS && zend_is_true(*tmpzval)) ) {
reqok = 1;
}
- switch(response_code) {
- case 200:
- case 206: /* partial content */
- case 302:
- case 303:
- case 301:
- reqok = 1;
- break;
- case 403:
- php_stream_notify_error(context,
PHP_STREAM_NOTIFY_AUTH_RESULT,
- tmp_line,
response_code);
- break;
- default:
- /* safety net in the event tmp_line ==
NULL */
- if (!tmp_line_len) {
- tmp_line[0] = '\0';
- }
- php_stream_notify_error(context,
PHP_STREAM_NOTIFY_FAILURE,
- tmp_line,
response_code);
+ /* all status codes in the 2xx range are defined by the
specification as successful;
+* all status codes in the 3xx range are for
redirection, and so also should never
+* fail */
+ if (response_code >= 200 && response_code < 400) {
+ reqok = 1;
+ } else {
+ switch(response_code) {
+ case 403:
+
php_stream_notify_error(context, PHP_STREAM_NOTIFY_AUTH_RESULT,
+ tmp_line,
response_code);
+ break;
+ default:
+ /* safety net in the event
tmp_line == NULL */
+ if (!tmp_line_len) {
+ tmp_line[0] = '\0';
+ }
+
php_stream_notify_error(context, PHP_STREAM_NOTIFY_FAILURE,
+ tmp_line,
response_code);
+ }
}
if (tmp_line[tmp_line_len - 1] == '\n') {
--tmp_line_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard http_fopen_wrapper.c
mikeFri Jul 25 08:27:10 2008 UTC
Modified files:
/php-src/ext/standard http_fopen_wrapper.c
Log:
- Changed HTTP stream wrapper to accept any code between and including
200 to 399 as successful. (patch by Noah Fontes)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.134&r2=1.135&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.134
php-src/ext/standard/http_fopen_wrapper.c:1.135
--- php-src/ext/standard/http_fopen_wrapper.c:1.134 Fri Jul 11 10:24:29 2008
+++ php-src/ext/standard/http_fopen_wrapper.c Fri Jul 25 08:27:10 2008
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.134 2008/07/11 10:24:29 tony2001 Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.135 2008/07/25 08:27:10 mike Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -572,25 +572,25 @@
(context &&
php_stream_context_get_option(context, "http", "ignore_errors", &tmpzval) ==
SUCCESS && zend_is_true(*tmpzval)) ) {
reqok = 1;
}
- switch(response_code) {
- case 200:
- case 206: /* partial content */
- case 302:
- case 303:
- case 301:
- reqok = 1;
- break;
- case 403:
- php_stream_notify_error(context,
PHP_STREAM_NOTIFY_AUTH_RESULT,
- tmp_line,
response_code);
- break;
- default:
- /* safety net in the event tmp_line ==
NULL */
- if (!tmp_line_len) {
- tmp_line[0] = '\0';
- }
- php_stream_notify_error(context,
PHP_STREAM_NOTIFY_FAILURE,
- tmp_line,
response_code);
+ /* all status codes in the 2xx range are defined by the
specification as successful;
+* all status codes in the 3xx range are for
redirection, and so also should never
+* fail */
+ if (response_code >= 200 && response_code < 400) {
+ reqok = 1;
+ } else {
+ switch(response_code) {
+ case 403:
+
php_stream_notify_error(context, PHP_STREAM_NOTIFY_AUTH_RESULT,
+ tmp_line,
response_code);
+ break;
+ default:
+ /* safety net in the event
tmp_line == NULL */
+ if (!tmp_line_len) {
+ tmp_line[0] = '\0';
+ }
+
php_stream_notify_error(context, PHP_STREAM_NOTIFY_FAILURE,
+ tmp_line,
response_code);
+ }
}
if (tmp_line[tmp_line_len - 1] == '\n') {
--tmp_line_len;
--
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 /ext/mysqli mysqli.c /ext/pdo pdo_dbh.c pdo_stmt.c /ext/pgsql pgsql.c /ext/reflection php_reflection.c /ext/spl spl_directory.c /ext/sqlite
dmitry Fri Jul 25 08:23:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2zend_execute_API.c
/php-src/main/streams userspace.c
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/pdopdo_dbh.c pdo_stmt.c
/php-src/ext/pgsql pgsql.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/splspl_directory.c
/php-src/ext/sqlite sqlite.c
Log:
Fixed uninitialised data
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.331.2.20.2.24.2.44&r2=1.331.2.20.2.24.2.45&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.44
ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.45
--- ZendEngine2/zend_execute_API.c:1.331.2.20.2.24.2.44 Thu Jul 24 09:42:15 2008
+++ ZendEngine2/zend_execute_API.c Fri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.44 2008/07/24 09:42:15 dmitry
Exp $ */
+/* $Id: zend_execute_API.c,v 1.331.2.20.2.24.2.45 2008/07/25 08:23:06 dmitry
Exp $ */
#include
#include
@@ -1254,6 +1254,7 @@
fcall_cache.initialized = EG(autoload_func) ? 1 : 0;
fcall_cache.function_handler = EG(autoload_func);
fcall_cache.calling_scope = NULL;
+ fcall_cache.called_scope = NULL;
fcall_cache.object_pp = NULL;
exception = EG(exception);
http://cvs.php.net/viewvc.cgi/php-src/main/streams/userspace.c?r1=1.31.2.3.2.7.2.3&r2=1.31.2.3.2.7.2.4&diff_format=u
Index: php-src/main/streams/userspace.c
diff -u php-src/main/streams/userspace.c:1.31.2.3.2.7.2.3
php-src/main/streams/userspace.c:1.31.2.3.2.7.2.4
--- php-src/main/streams/userspace.c:1.31.2.3.2.7.2.3 Fri Jul 11 10:25:15 2008
+++ php-src/main/streams/userspace.cFri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: userspace.c,v 1.31.2.3.2.7.2.3 2008/07/11 10:25:15 tony2001 Exp $ */
+/* $Id: userspace.c,v 1.31.2.3.2.7.2.4 2008/07/25 08:23:06 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -262,6 +262,7 @@
fcc.initialized = 1;
fcc.function_handler = uwrap->ce->constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(us->object);
fcc.object_pp = &us->object;
if (zend_call_function(&fci, &fcc TSRMLS_CC) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.24&r2=1.213.2.6.2.16.2.25&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.24
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.25
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.24 Tue Jul 22 23:44:23 2008
+++ php-src/ext/mysql/php_mysql.c Fri Jul 25 08:23:06 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.24 2008/07/22 23:44:23 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.25 2008/07/25 08:23:06 dmitry Exp $ */
/* TODO:
*
@@ -2176,6 +2176,7 @@
fcc.initialized = 1;
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(return_value);
fcc.object_pp = &return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.17.2.28&r2=1.72.2.16.2.17.2.29&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.28
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.29
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17.2.28 Mon Jul 21 12:58:51 2008
+++ php-src/ext/mysqli/mysqli.c Fri Jul 25 08:23:06 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.17.2.28 2008/07/21 12:58:51 andrey Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17.2.29 2008/07/25 08:23:06 dmitry Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1305,6 +1305,7 @@
fcc.initialized = 1;
fcc.function_handler = ce->constructor;
fcc.calling_scope = EG(scope);
+ fcc.called_scope = Z_OBJCE_P(return_value);
fcc.object_pp = &return_value;
if (zend_call_function(&fci, &fcc TSRMLS_CC) ==
FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.10&r2=1.82.2.31.2.17.2.11&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_d
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c mbstring.h
On 25.07.2008 02:21, Moriyoshi Koizumi wrote: moriyoshi Thu Jul 24 22:21:42 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/mbstring/tests zend_multibyte-01.phpt zend_multibyte-02.phpt zend_multibyte-03.phpt zend_multibyte-04.phpt zend_multibyte-05.phpt zend_multibyte-06.phpt zend_multibyte-07.phpt zend_multibyte-08.phpt zend_multibyte-09.phpt zend_multibyte-10.phpt zend_multibyte-11.phpt zend_multibyte-12.phpt All of these tests fail (except for the first one). -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
