[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Feb 17 01:31:29 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2960r2=1.2961diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2960 php-src/ChangeLog:1.2961 --- php-src/ChangeLog:1.2960Sat Feb 16 01:31:32 2008 +++ php-src/ChangeLog Sun Feb 17 01:31:28 2008 @@ -1,3 +1,82 @@ +2008-02-16 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/tests/array/count_variation3.phpt: + Fix test + +2008-02-16 Rui Hirokawa [EMAIL PROTECTED] + +* (PHP_4_4) + ext/mbstring/mbstring.c + ext/mbstring/libmbfl/nls/nls_hy.c: + revert commit. + +* (PHP_5_3) + ext/mbstring/php_unicode.c: + fixed #43998 Two error messages returned for incorrect encoding for + mb_strto[upper|lower] + +* (PHP_5_3) + ext/mbstring/php_mbregex.c: + fixed #43994 mb_ereg 'successfully' matching incorrectly. + +* (PHP_5_3) + ext/mbstring/mbstring.c: + fixed #43841 mb_strrpos offset is byte count for negative values. + +* (PHP_5_3) + ext/mbstring/mbstring.c: + fixed bug #43840 mb_strpos bounds check is byte count rather than a + character count. + +* ext/mbstring/mbstring.c + ext/mbstring/mbstring.c + ext/mbstring/libmbfl/nls/nls_hy.c + ext/mbstring/libmbfl/nls/nls_hy.c: + MFB + +* (PHP_5_3) + ext/mbstring/libmbfl/nls/nls_hy.c: + removed unnecessary space. + +* (PHP_5_2) + ext/mbstring/mbstring.c + ext/mbstring/libmbfl/nls/nls_hy.c: + MF PHP5_3 + +* (PHP_5_3) + ext/mbstring/mbstring.c: + 'auto' encoding was not initialized correctly per request basis. + +2008-02-16 Christopher Jones [EMAIL PROTECTED] + +* ext/oci8/tests/lob_042.phpt + ext/oci8/tests/lob_042.phpt: + MFB: Test existing LOB error messages + +* ext/oci8/tests/lob_042.phpt + ext/oci8/tests/lob_042.phpt + ext/oci8/tests/lob_042.phpt: +1.1.4; + file lob_042.phpt was initially added on branch PHP_5_2. + +2008-02-16 Felipe Pena [EMAIL PROTECTED] + +* main/main.c: + Fix build + +2008-02-16 Christopher Jones [EMAIL PROTECTED] + +* (PHP_5_3) + ext/oci8/oci8.c + ext/oci8/php_oci8_int.h + ext/oci8/tests/debug.phpt + ext/oci8/tests/details.inc: + Streamlined code and incorporated review comments. Respect + oci8.ping_interval when oci_pconnect called multiple times in a script. + Changed OCIServerVersion to OCIPing + (http://pecl.php.net/bugs/bug.php?id=11976) + 2008-02-15 Christopher Jones [EMAIL PROTECTED] * ext/oci8/oci8_collection.c
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c
hirokawaSat Feb 16 08:21:39 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
Log:
'auto' encoding was not initialized correctly per request basis.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.4r2=1.224.2.22.2.25.2.5diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.4
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.5
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.4 Mon Dec 31 07:17:09 2007
+++ php-src/ext/mbstring/mbstring.c Sat Feb 16 08:21:39 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.4 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.5 2008/02/16 08:21:39 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -888,6 +888,8 @@
const struct mb_overload_def *p;
MBSTRG(current_language) = MBSTRG(language);
+ php_mb_nls_get_default_detect_order_list(MBSTRG(language),
+MBSTRG(default_detect_order_list),
MBSTRG(default_detect_order_list_size));
if (MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
char *default_enc = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring mbstring.c
hirokawaSat Feb 16 08:25:11 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
Log:
MF PHP5_3
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.27r2=1.224.2.22.2.28diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.27
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.28
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.27 Mon Dec 31 07:20:07 2007
+++ php-src/ext/mbstring/mbstring.c Sat Feb 16 08:25:11 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.27 2007/12/31 07:20:07 sebastian Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.28 2008/02/16 08:25:11 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -888,6 +888,8 @@
const struct mb_overload_def *p;
MBSTRG(current_language) = MBSTRG(language);
+ php_mb_nls_get_default_detect_order_list(MBSTRG(language),
+MBSTRG(default_detect_order_list),
MBSTRG(default_detect_order_list_size));
if (MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
char *default_enc = NULL;
--
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/libmbfl/nls nls_hy.c
hirokawaSat Feb 16 08:32:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring/libmbfl/nls nls_hy.c
Log:
removed unnecessary space.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/nls/nls_hy.c?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/nls/nls_hy.c
diff -u php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1
php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1.8.1
--- php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1 Tue Mar 22 22:22:11 2005
+++ php-src/ext/mbstring/libmbfl/nls/nls_hy.c Sat Feb 16 08:32:26 2008
@@ -11,7 +11,7 @@
const mbfl_language mbfl_language_armenian = {
mbfl_no_language_armenian ,
- Armenian ,
+ Armenian,
hy,
NULL,
mbfl_no_encoding_armscii8,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring/libmbfl/nls nls_hy.c
hirokawaSat Feb 16 08:32:58 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring/libmbfl/nls nls_hy.c
Log:
MF PHP5_3
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/nls/nls_hy.c?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/nls/nls_hy.c
diff -u php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1
php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1.6.1
--- php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1 Tue Mar 22 22:22:11 2005
+++ php-src/ext/mbstring/libmbfl/nls/nls_hy.c Sat Feb 16 08:32:57 2008
@@ -11,7 +11,7 @@
const mbfl_language mbfl_language_armenian = {
mbfl_no_language_armenian ,
- Armenian ,
+ Armenian,
hy,
NULL,
mbfl_no_encoding_armscii8,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/nls nls_hy.c
hirokawaSat Feb 16 08:48:31 2008 UTC
Modified files:
/php-src/ext/mbstring/libmbfl/nls nls_hy.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/nls/nls_hy.c?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mbstring/libmbfl/nls/nls_hy.c
diff -u php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1
php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.2
--- php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1 Tue Mar 22 22:22:11 2005
+++ php-src/ext/mbstring/libmbfl/nls/nls_hy.c Sat Feb 16 08:48:31 2008
@@ -11,7 +11,7 @@
const mbfl_language mbfl_language_armenian = {
mbfl_no_language_armenian ,
- Armenian ,
+ Armenian,
hy,
NULL,
mbfl_no_encoding_armscii8,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring/libmbfl/nls nls_hy.c
hirokawaSat Feb 16 08:49:40 2008 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring/libmbfl/nls nls_hy.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/nls/nls_hy.c?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/mbstring/libmbfl/nls/nls_hy.c
diff -u php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1.4.2
php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1.4.3
--- php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1.4.2 Fri Dec 30 05:25:54 2005
+++ php-src/ext/mbstring/libmbfl/nls/nls_hy.c Sat Feb 16 08:49:40 2008
@@ -11,7 +11,7 @@
const mbfl_language mbfl_language_armenian = {
mbfl_no_language_armenian ,
- Armenian ,
+ Armenian,
hy,
NULL,
mbfl_no_encoding_armscii8,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c
hirokawaSat Feb 16 08:50:08 2008 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring mbstring.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.21r2=1.142.2.47.2.22diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.21
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.22
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.21 Wed Apr 4 15:28:18 2007
+++ php-src/ext/mbstring/mbstring.c Sat Feb 16 08:50:07 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.21 2007/04/04 15:28:18 masugata Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.22 2008/02/16 08:50:07 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -971,6 +971,8 @@
const struct mb_overload_def *p;
MBSTRG(current_language) = MBSTRG(language);
+ php_mb_nls_get_default_detect_order_list(MBSTRG(language),
+MBSTRG(default_detect_order_list),
MBSTRG(default_detect_order_list_size));
if (MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
char *default_enc = NULL;
--
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
hirokawaSat Feb 16 08:58:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
Log:
fixed bug #43840 mb_strpos bounds check is byte count rather than a
character count.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.5r2=1.224.2.22.2.25.2.6diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.5
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.6
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.5 Sat Feb 16 08:21:39 2008
+++ php-src/ext/mbstring/mbstring.c Sat Feb 16 08:58:00 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.5 2008/02/16 08:21:39 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.6 2008/02/16 08:58:00 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -1613,7 +1613,7 @@
}
}
- if (offset 0 || (unsigned long)offset haystack.len) {
+ if (offset 0 || (unsigned long)offset (unsigned
long)mbfl_strlen(haystack)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not
contained in string.);
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/mbstring mbstring.c
hirokawaSat Feb 16 08:49:07 2008 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.275r2=1.276diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.275
php-src/ext/mbstring/mbstring.c:1.276
--- php-src/ext/mbstring/mbstring.c:1.275 Mon Dec 31 07:12:11 2007
+++ php-src/ext/mbstring/mbstring.c Sat Feb 16 08:49:07 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.275 2007/12/31 07:12:11 sebastian Exp $ */
+/* $Id: mbstring.c,v 1.276 2008/02/16 08:49:07 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -892,6 +892,8 @@
const struct mb_overload_def *p;
MBSTRG(current_language) = MBSTRG(language);
+ php_mb_nls_get_default_detect_order_list(MBSTRG(language),
+MBSTRG(default_detect_order_list),
MBSTRG(default_detect_order_list_size));
if (MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
char *default_enc = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests reflectionProperty_setAccesible.phpt
Hi,
On Fri, 2008-02-15 at 12:37 +, Derick Rethans wrote:
derickFri Feb 15 12:37:38 2008 UTC
Added files:
/php-src/ext/reflection/tests reflectionProperty_setAccesible.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- Add the ReflectionProperty::setAccesible() method that allows non-public
property's values to be read through ::getValue().
Won't it make sense to do the same for ReflectionClass (at least its
newInstanceArgs() method), too? This would help with factories like:
?php
abstract class Factory {
abstract protected function __construct();
public static function factory() {
$rc = new ReflectionClass(get_called_class());
return $rc-newInstanceArgs(func_get_args());
}
}
class Foo extends factory { protected function __construct() {}}
var_dump(Foo::factory());
?
Anybody has timemotivation? :-)
johannes
--
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
hirokawaSat Feb 16 10:43:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
Log:
fixed #43841 mb_strrpos offset is byte count for negative values.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.6r2=1.224.2.22.2.25.2.7diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.6
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.7
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.6 Sat Feb 16 08:58:00 2008
+++ php-src/ext/mbstring/mbstring.c Sat Feb 16 10:43:57 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.6 2008/02/16 08:58:00 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.7 2008/02/16 10:43:57 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -1726,6 +1726,13 @@
if (needle.len = 0) {
RETURN_FALSE;
}
+
+ if ((offset 0 offset mbfl_strlen(haystack)) ||
+ (offset 0 -offset mbfl_strlen(haystack))) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater
than the length of haystack string);
+ RETURN_FALSE;
+ }
+
n = mbfl_strpos(haystack, needle, offset, 1);
if (n = 0) {
RETVAL_LONG(n);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c
On Sat, 16 Feb 2008, Rui Hirokawa wrote: hirokawa Sat Feb 16 08:50:08 2008 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/mbstring mbstring.c Log: MFB Rui, PHP 4 is no longer supported. In order to use it *just* for security fixes, it is probably a good idea not to have normal commits in this branch *at all*. Could you please revert your last two commits? regards, Derick -- Derick Rethans 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 php_unicode.c
hirokawaSat Feb 16 12:01:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring php_unicode.c
Log:
fixed #43998 Two error messages returned for incorrect encoding for
mb_strto[upper|lower]
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_unicode.c?r1=1.11.2.2.2.2.2.1r2=1.11.2.2.2.2.2.2diff_format=u
Index: php-src/ext/mbstring/php_unicode.c
diff -u php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.2.2.1
php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.2.2.2
--- php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.2.2.1 Mon Dec 31 07:17:09 2007
+++ php-src/ext/mbstring/php_unicode.c Sat Feb 16 12:01:43 2008
@@ -276,6 +276,11 @@
size_t i;
enum mbfl_no_encoding _src_encoding =
mbfl_name2no_encoding(src_encoding);
+ if (_src_encoding == mbfl_no_encoding_invalid) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown encoding
\%s\, src_encoding);
+ return NULL;
+ }
+
unicode = php_mb_convert_encoding(srcstr, srclen, UCS-4BE,
src_encoding, unicode_len TSRMLS_CC);
if (unicode == NULL)
return NULL;
--
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 php_mbregex.c
hirokawaSat Feb 16 11:46:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring php_mbregex.c
Log:
fixed #43994 mb_ereg 'successfully' matching incorrectly.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.53.2.1.2.4.2.3r2=1.53.2.1.2.4.2.4diff_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.3
php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.4
--- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.3 Mon Dec 31 07:17:09 2007
+++ php-src/ext/mbstring/php_mbregex.c Sat Feb 16 11:46:03 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.3 2007/12/31 07:17:09 sebastian Exp $ */
+/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.4 2008/02/16 11:46:03 hirokawa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -546,6 +546,13 @@
convert_to_string_ex(arg_pattern);
/* don't bother doing an extended regex with just a number */
}
+
+ if (!Z_STRVAL_PP(arg_pattern) || Z_STRLEN_PP(arg_pattern) == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, empty pattern);
+ RETVAL_FALSE;
+ goto out;
+ }
+
re = php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern),
Z_STRLEN_PP(arg_pattern), options, MBSTRG(current_mbctype),
MBSTRG(regex_default_syntax) TSRMLS_CC);
if (re == NULL) {
RETVAL_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c
hirokawaSat Feb 16 12:41:55 2008 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring mbstring.c
Log:
revert commit.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.22r2=1.142.2.47.2.23diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.22
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.23
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.22 Sat Feb 16 08:50:07 2008
+++ php-src/ext/mbstring/mbstring.c Sat Feb 16 12:41:55 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.22 2008/02/16 08:50:07 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.23 2008/02/16 12:41:55 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -971,8 +971,6 @@
const struct mb_overload_def *p;
MBSTRG(current_language) = MBSTRG(language);
- php_mb_nls_get_default_detect_order_list(MBSTRG(language),
-MBSTRG(default_detect_order_list),
MBSTRG(default_detect_order_list_size));
if (MBSTRG(internal_encoding) == mbfl_no_encoding_invalid) {
char *default_enc = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring/libmbfl/nls nls_hy.c
hirokawaSat Feb 16 12:42:09 2008 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring/libmbfl/nls nls_hy.c
Log:
revert commit.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/nls/nls_hy.c?r1=1.1.4.3r2=1.1.4.4diff_format=u
Index: php-src/ext/mbstring/libmbfl/nls/nls_hy.c
diff -u php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1.4.3
php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1.4.4
--- php-src/ext/mbstring/libmbfl/nls/nls_hy.c:1.1.4.3 Sat Feb 16 08:49:40 2008
+++ php-src/ext/mbstring/libmbfl/nls/nls_hy.c Sat Feb 16 12:42:08 2008
@@ -11,7 +11,7 @@
const mbfl_language mbfl_language_armenian = {
mbfl_no_language_armenian ,
- Armenian,
+ Armenian ,
hy,
NULL,
mbfl_no_encoding_armscii8,
--
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
Please MFH the fix into the 5.2 branch.
On 16-Feb-08, at 3:58 AM, Rui Hirokawa wrote:
hirokawaSat Feb 16 08:58:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstringmbstring.c
Log:
fixed bug #43840 mb_strpos bounds check is byte count rather than
a character count.
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.5r2=1.224.2.22.2.25.2.6diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.5 php-src/
ext/mbstring/mbstring.c:1.224.2.22.2.25.2.6
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.5 Sat Feb 16
08:21:39 2008
+++ php-src/ext/mbstring/mbstring.c Sat Feb 16 08:58:00 2008
@@ -17,7 +17,7 @@
+
--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.5 2008/02/16 08:21:39
hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.6 2008/02/16 08:58:00
hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -1613,7 +1613,7 @@
}
}
- if (offset 0 || (unsigned long)offset haystack.len) {
+ if (offset 0 || (unsigned long)offset (unsigned
long)mbfl_strlen(haystack)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not contained
in string.);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Ilia Alshanetsky
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array count_variation3.phpt
felipe Sat Feb 16 16:35:39 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array count_variation3.phpt Log: Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/count_variation3.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/count_variation3.phpt diff -u php-src/ext/standard/tests/array/count_variation3.phpt:1.1.4.2 php-src/ext/standard/tests/array/count_variation3.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/count_variation3.phpt:1.1.4.2 Thu Feb 14 16:49:58 2008 +++ php-src/ext/standard/tests/array/count_variation3.phpt Sat Feb 16 16:35:39 2008 @@ -32,4 +32,8 @@ -- $mode not set: -- int(4) --- $mode = 1: -- \ No newline at end of file +-- $mode = 1: -- + +Warning: count(): recursion detected in %s on line %d +int(12) +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) /win32/build confutils.js
pajoye Sun Feb 17 01:26:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js
Log:
- add PHP_PHP_BUILD\bin to the path in PATH_PROG (option set with
--with-php-builds=[PATH] the zip.zip contains all we need (except re2c! )
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.2r2=1.60.2.1.2.8.2.3diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.2
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.3
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.2 Thu Jan 10 18:21:56 2008
+++ php-src/win32/build/confutils.jsSun Feb 17 01:26:15 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.2 2008/01/10 18:21:56 rrichards Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.3 2008/02/17 01:26:15 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -501,6 +501,7 @@
var exe;
var place;
var cyg_path = PHP_CYGWIN + \\bin; + PHP_CYGWIN + \\usr\\local\\bin;
+ var php_build_bin_path = PHP_PHP_BUILD + \\bin
exe = progname + .exe;
@@ -510,6 +511,8 @@
additional_paths += ; + cyg_path;
}
+ additional_paths = additional_paths + ; + php_build_bin_path;
+
place = search_paths(exe, additional_paths, PATH);
if (place == true) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_slice.phpt
felipe Sun Feb 17 01:21:15 2008 UTC
Modified files:
/php-src/ext/standard/tests/array array_slice.phpt
Log:
Fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/array/array_slice.phpt
diff -u php-src/ext/standard/tests/array/array_slice.phpt:1.3
php-src/ext/standard/tests/array/array_slice.phpt:1.4
--- php-src/ext/standard/tests/array/array_slice.phpt:1.3 Tue Dec 11
08:30:46 2007
+++ php-src/ext/standard/tests/array/array_slice.phpt Sun Feb 17 01:21:15 2008
@@ -216,23 +216,7 @@
[2]=
int(4)
}
-array(8) {
- [0]=
- int(2)
- [1]=
- int(3)
- [2]=
- int(4)
- [3]=
- int(5)
- [4]=
- int(6)
- [5]=
- int(7)
- [6]=
- int(8)
- [7]=
- int(9)
+array(0) {
}
array(5) {
[0]=
@@ -254,25 +238,7 @@
[2]=
int(3)
}
-array(9) {
- [0]=
- int(1)
- [1]=
- int(2)
- [2]=
- int(3)
- [3]=
- int(4)
- [4]=
- int(5)
- [5]=
- int(6)
- [6]=
- int(7)
- [7]=
- int(8)
- [8]=
- int(9)
+array(0) {
}
array(6) {
[0]=
@@ -294,11 +260,7 @@
[1]=
int(9)
}
-array(2) {
- [0]=
- int(8)
- [1]=
- int(9)
+array(0) {
}
array(0) {
}
@@ -312,23 +274,7 @@
[3]=
int(4)
}
-array(8) {
- [1]=
- int(2)
- [2]=
- int(3)
- [3]=
- int(4)
- [4]=
- int(5)
- [5]=
- int(6)
- [6]=
- int(7)
- [7]=
- int(8)
- [8]=
- int(9)
+array(0) {
}
array(5) {
[1]=
@@ -350,25 +296,7 @@
[2]=
int(3)
}
-array(9) {
- [0]=
- int(1)
- [1]=
- int(2)
- [2]=
- int(3)
- [3]=
- int(4)
- [4]=
- int(5)
- [5]=
- int(6)
- [6]=
- int(7)
- [7]=
- int(8)
- [8]=
- int(9)
+array(0) {
}
array(6) {
[0]=
@@ -390,11 +318,7 @@
[8]=
int(9)
}
-array(2) {
- [7]=
- int(8)
- [8]=
- int(9)
+array(0) {
}
array(0) {
}
@@ -440,15 +364,7 @@
[2]=
string(4) Four
}
-array(4) {
- [0]=
- string(3) Two
- [1]=
- string(5) Three
- [2]=
- string(4) Four
- [3]=
- string(4) Five
+array(0) {
}
array(1) {
[0]=
@@ -462,17 +378,7 @@
[2]=
string(5) Three
}
-array(5) {
- [0]=
- string(3) One
- [1]=
- string(3) Two
- [2]=
- string(5) Three
- [3]=
- string(4) Four
- [4]=
- string(4) Five
+array(0) {
}
array(2) {
[0]=
@@ -486,11 +392,7 @@
[1]=
string(4) Five
}
-array(2) {
- [0]=
- string(4) Four
- [1]=
- string(4) Five
+array(0) {
}
array(0) {
}
@@ -504,15 +406,7 @@
[3]=
string(4) Four
}
-array(4) {
- [1]=
- string(3) Two
- [2]=
- string(5) Three
- [3]=
- string(4) Four
- [4]=
- string(4) Five
+array(0) {
}
array(1) {
[1]=
@@ -526,17 +420,7 @@
[2]=
string(5) Three
}
-array(5) {
- [0]=
- string(3) One
- [1]=
- string(3) Two
- [2]=
- string(5) Three
- [3]=
- string(4) Four
- [4]=
- string(4) Five
+array(0) {
}
array(2) {
[0]=
@@ -550,11 +434,7 @@
[4]=
string(4) Five
}
-array(2) {
- [3]=
- string(4) Four
- [4]=
- string(4) Five
+array(0) {
}
array(0) {
}
@@ -612,21 +492,7 @@
[2]=
string(5) seven
}
-array(7) {
- [0]=
- string(3) six
- [1]=
- int(7)
- [2]=
- string(5) seven
- [3]=
- int(8)
- [4]=
- string(5) eight
- [5]=
- int(9)
- [6]=
- string(4) nine
+array(0) {
}
array(4) {
[0]=
@@ -646,23 +512,7 @@
[2]=
int(7)
}
-array(8) {
- [0]=
- int(6)
- [1]=
- string(3) six
- [2]=
- int(7)
- [3]=
- string(5) seven
- [4]=
- int(8)
- [5]=
- string(5) eight
- [6]=
- int(9)
- [7]=
- string(4) nine
+array(0) {
}
array(5) {
[0]=
@@ -682,11 +532,7 @@
[1]=
string(4) nine
}
-array(2) {
- [0]=
- int(9)
- [1]=
- string(4) nine
+array(0) {
}
array(0) {
}
@@ -700,21 +546,7 @@
[3]=
string(5) seven
}
-array(7) {
- [1]=
- string(3) six
- [2]=
- int(7)
- [3]=
- string(5) seven
- [4]=
- int(8)
- [5]=
- string(5) eight
- [6]=
- int(9)
- [7]=
- string(4) nine
+array(0) {
}
array(4) {
[1]=
@@ -734,23 +566,7 @@
[2]=
int(7)
}
-array(8) {
- [0]=
- int(6)
- [1]=
- string(3) six
- [2]=
- int(7)
- [3]=
- string(5) seven
- [4]=
- int(8)
- [5]=
- string(5) eight
- [6]=
- int(9)
- [7]=
- string(4) nine
+array(0) {
}
array(5) {
[0]=
@@ -770,11 +586,7 @@
[7]=
string(4) nine
}
-array(2) {
- [6]=
- int(9)
- [7]=
- string(4) nine
+array(0) {
}
array(0) {
}
@@ -820,15 +632,7 @@
[d]=
string(3) ddd
}
-array(4) {
- [A]=
- string(3) AAA
- [c]=
- string(3) ccc
- [d]=
- string(3) ddd
- [e]=
- string(3) eee
+array(0) {
}
array(1) {
[A]=
@@ -842,17 +646,7 @@
[c]=
string(3) ccc
}
-array(5) {
- [a]=
- string(3) aaa
- [A]=
- string(3) AAA
- [c]=
- string(3) ccc
- [d]=
- string(3) ddd
- [e]=
- string(3) eee
+array(0) {
}
array(2) {
[a]=
@@ -866,11 +660,7 @@
[e]=
string(3) eee
}
-array(2) {
- [d]=
- string(3) ddd
- [e]=
- string(3) eee
+array(0) {
}
array(0) {
}
@@ -884,17 +674,9 @@
[d]=
string(3) ddd
}
-array(4) {
- [A]=
- string(3) AAA
- [c]=
- string(3) ccc
- [d]=
- string(3) ddd
- [e]=
- string(3) eee
-}
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_slice.phpt
felipe Sun Feb 17 01:03:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array array_slice.phpt
Log:
Fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice.phpt?r1=1.2.2.3r2=1.2.2.4diff_format=u
Index: php-src/ext/standard/tests/array/array_slice.phpt
diff -u php-src/ext/standard/tests/array/array_slice.phpt:1.2.2.3
php-src/ext/standard/tests/array/array_slice.phpt:1.2.2.4
--- php-src/ext/standard/tests/array/array_slice.phpt:1.2.2.3 Tue Dec 11
09:47:20 2007
+++ php-src/ext/standard/tests/array/array_slice.phpt Sun Feb 17 01:03:19 2008
@@ -91,23 +91,23 @@
--EXPECTF--
*** Output for Zero Argument ***
-Warning: array_slice() expects at least 2 parameters, 0 given in %s on line %d
+Warning: array_slice() expects at least 2 parameters, 0 given in
/home/felipe/php5/ext/standard/tests/array/array_slice.php on line 22
*** Output for Single array Argument ***
-Warning: array_slice() expects at least 2 parameters, 1 given in %s on line %d
+Warning: array_slice() expects at least 2 parameters, 1 given in
/home/felipe/php5/ext/standard/tests/array/array_slice.php on line 26
*** Output for invalid number of Arguments ***
-Warning: array_slice() expects at most 4 parameters, 5 given in %s on line %d
+Warning: array_slice() expects at most 4 parameters, 5 given in
/home/felipe/php5/ext/standard/tests/array/array_slice.php on line 30
*** Output for scalar Argument ***
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on
line %d
+Warning: array_slice() expects parameter 1 to be array, integer given in
/home/felipe/php5/ext/standard/tests/array/array_slice.php on line 34
*** Output for string Argument ***
-Warning: array_slice() expects parameter 1 to be array, string given in %s on
line %d
+Warning: array_slice() expects parameter 1 to be array, string given in
/home/felipe/php5/ext/standard/tests/array/array_slice.php on line 38
*** Iteration 1 ***
@@ -216,23 +216,7 @@
[2]=
int(4)
}
-array(8) {
- [0]=
- int(2)
- [1]=
- int(3)
- [2]=
- int(4)
- [3]=
- int(5)
- [4]=
- int(6)
- [5]=
- int(7)
- [6]=
- int(8)
- [7]=
- int(9)
+array(0) {
}
array(5) {
[0]=
@@ -254,25 +238,7 @@
[2]=
int(3)
}
-array(9) {
- [0]=
- int(1)
- [1]=
- int(2)
- [2]=
- int(3)
- [3]=
- int(4)
- [4]=
- int(5)
- [5]=
- int(6)
- [6]=
- int(7)
- [7]=
- int(8)
- [8]=
- int(9)
+array(0) {
}
array(6) {
[0]=
@@ -294,11 +260,7 @@
[1]=
int(9)
}
-array(2) {
- [0]=
- int(8)
- [1]=
- int(9)
+array(0) {
}
array(0) {
}
@@ -312,23 +274,7 @@
[3]=
int(4)
}
-array(8) {
- [1]=
- int(2)
- [2]=
- int(3)
- [3]=
- int(4)
- [4]=
- int(5)
- [5]=
- int(6)
- [6]=
- int(7)
- [7]=
- int(8)
- [8]=
- int(9)
+array(0) {
}
array(5) {
[1]=
@@ -350,25 +296,7 @@
[2]=
int(3)
}
-array(9) {
- [0]=
- int(1)
- [1]=
- int(2)
- [2]=
- int(3)
- [3]=
- int(4)
- [4]=
- int(5)
- [5]=
- int(6)
- [6]=
- int(7)
- [7]=
- int(8)
- [8]=
- int(9)
+array(0) {
}
array(6) {
[0]=
@@ -390,11 +318,7 @@
[8]=
int(9)
}
-array(2) {
- [7]=
- int(8)
- [8]=
- int(9)
+array(0) {
}
array(0) {
}
@@ -440,15 +364,7 @@
[2]=
string(4) Four
}
-array(4) {
- [0]=
- string(3) Two
- [1]=
- string(5) Three
- [2]=
- string(4) Four
- [3]=
- string(4) Five
+array(0) {
}
array(1) {
[0]=
@@ -462,17 +378,7 @@
[2]=
string(5) Three
}
-array(5) {
- [0]=
- string(3) One
- [1]=
- string(3) Two
- [2]=
- string(5) Three
- [3]=
- string(4) Four
- [4]=
- string(4) Five
+array(0) {
}
array(2) {
[0]=
@@ -486,11 +392,7 @@
[1]=
string(4) Five
}
-array(2) {
- [0]=
- string(4) Four
- [1]=
- string(4) Five
+array(0) {
}
array(0) {
}
@@ -504,15 +406,7 @@
[3]=
string(4) Four
}
-array(4) {
- [1]=
- string(3) Two
- [2]=
- string(5) Three
- [3]=
- string(4) Four
- [4]=
- string(4) Five
+array(0) {
}
array(1) {
[1]=
@@ -526,17 +420,7 @@
[2]=
string(5) Three
}
-array(5) {
- [0]=
- string(3) One
- [1]=
- string(3) Two
- [2]=
- string(5) Three
- [3]=
- string(4) Four
- [4]=
- string(4) Five
+array(0) {
}
array(2) {
[0]=
@@ -550,11 +434,7 @@
[4]=
string(4) Five
}
-array(2) {
- [3]=
- string(4) Four
- [4]=
- string(4) Five
+array(0) {
}
array(0) {
}
@@ -612,21 +492,7 @@
[2]=
string(5) seven
}
-array(7) {
- [0]=
- string(3) six
- [1]=
- int(7)
- [2]=
- string(5) seven
- [3]=
- int(8)
- [4]=
- string(5) eight
- [5]=
- int(9)
- [6]=
- string(4) nine
+array(0) {
}
array(4) {
[0]=
@@ -646,23 +512,7 @@
[2]=
int(7)
}
-array(8) {
- [0]=
- int(6)
- [1]=
- string(3) six
- [2]=
- int(7)
- [3]=
- string(5) seven
- [4]=
- int(8)
- [5]=
- string(5) eight
- [6]=
- int(9)
- [7]=
- string(4) nine
+array(0) {
}
array(5) {
[0]=
@@ -682,11 +532,7 @@
[1]=
string(4) nine
}
-array(2) {
- [0]=
- int(9)
- [1]=
-
[PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Sun Feb 17 01:29:17 2008 UTC
Modified files:
/php-src/win32/buildconfutils.js
Log:
- MFB: add PHP_PHP_BUILD\bin to the path in PATH_PROG (option set with
--with-php-builds=[PATH] the zip.zip contains all we need (except re2c! )
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.71r2=1.72diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.71
php-src/win32/build/confutils.js:1.72
--- php-src/win32/build/confutils.js:1.71 Thu Jan 10 18:21:23 2008
+++ php-src/win32/build/confutils.jsSun Feb 17 01:29:16 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.71 2008/01/10 18:21:23 rrichards Exp $
+// $Id: confutils.js,v 1.72 2008/02/17 01:29:16 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -501,6 +501,7 @@
var exe;
var place;
var cyg_path = PHP_CYGWIN + \\bin; + PHP_CYGWIN + \\usr\\local\\bin;
+ var php_build_bin_path = PHP_PHP_BUILD + \\bin
exe = progname + .exe;
@@ -510,6 +511,8 @@
additional_paths += ; + cyg_path;
}
+ additional_paths = additional_paths + ; + php_build_bin_path;
+
place = search_paths(exe, additional_paths, PATH);
if (place == true) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring mbstring.c
hirokawaSun Feb 17 01:59:03 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
Log:
MF PHP5_3 (fixed #43840)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.28r2=1.224.2.22.2.29diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.28
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.29
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.28 Sat Feb 16 08:25:11 2008
+++ php-src/ext/mbstring/mbstring.c Sun Feb 17 01:59:03 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.28 2008/02/16 08:25:11 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.29 2008/02/17 01:59:03 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -1613,7 +1613,7 @@
}
}
- if (offset 0 || (unsigned long)offset haystack.len) {
+ if (offset 0 || (unsigned long)offset (unsigned
long)mbfl_strlen(haystack)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not
contained in string.);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring mbstring.c
hirokawaSun Feb 17 02:06:56 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring mbstring.c
Log:
MF PHP5_3 (fixed #43841)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.29r2=1.224.2.22.2.30diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.29
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.30
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.29 Sun Feb 17 01:59:03 2008
+++ php-src/ext/mbstring/mbstring.c Sun Feb 17 02:06:56 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.29 2008/02/17 01:59:03 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.30 2008/02/17 02:06:56 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -1726,6 +1726,13 @@
if (needle.len = 0) {
RETURN_FALSE;
}
+
+ if ((offset 0 offset mbfl_strlen(haystack)) ||
+ (offset 0 -offset mbfl_strlen(haystack))) {
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Offset is greater
than the length of haystack string);
+ RETURN_FALSE;
+ }
+
n = mbfl_strpos(haystack, needle, offset, 1);
if (n = 0) {
RETVAL_LONG(n);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring php_unicode.c
hirokawaSun Feb 17 02:01:41 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring php_unicode.c
Log:
MF PHP5_3 (fixed #43998)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_unicode.c?r1=1.11.2.2.2.3r2=1.11.2.2.2.4diff_format=u
Index: php-src/ext/mbstring/php_unicode.c
diff -u php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.3
php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.4
--- php-src/ext/mbstring/php_unicode.c:1.11.2.2.2.3 Mon Dec 31 07:20:07 2007
+++ php-src/ext/mbstring/php_unicode.c Sun Feb 17 02:01:41 2008
@@ -276,6 +276,11 @@
size_t i;
enum mbfl_no_encoding _src_encoding =
mbfl_name2no_encoding(src_encoding);
+ if (_src_encoding == mbfl_no_encoding_invalid) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown encoding
\%s\, src_encoding);
+ return NULL;
+ }
+
unicode = php_mb_convert_encoding(srcstr, srclen, UCS-4BE,
src_encoding, unicode_len TSRMLS_CC);
if (unicode == NULL)
return NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring php_mbregex.c
hirokawaSun Feb 17 02:04:12 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/mbstring php_mbregex.c
Log:
MF PHP5_3 (fixed #43994)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.53.2.1.2.6r2=1.53.2.1.2.7diff_format=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.6
php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.7
--- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.6 Mon Dec 31 07:20:07 2007
+++ php-src/ext/mbstring/php_mbregex.c Sun Feb 17 02:04:12 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.53.2.1.2.6 2007/12/31 07:20:07 sebastian Exp $ */
+/* $Id: php_mbregex.c,v 1.53.2.1.2.7 2008/02/17 02:04:12 hirokawa Exp $ */
#ifdef HAVE_CONFIG_H
@@ -546,6 +546,13 @@
convert_to_string_ex(arg_pattern);
/* don't bother doing an extended regex with just a number */
}
+
+ if (!Z_STRVAL_PP(arg_pattern) || Z_STRLEN_PP(arg_pattern) == 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, empty pattern);
+ RETVAL_FALSE;
+ goto out;
+ }
+
re = php_mbregex_compile_pattern(Z_STRVAL_PP(arg_pattern),
Z_STRLEN_PP(arg_pattern), options, MBSTRG(current_mbctype),
MBSTRG(regex_default_syntax) TSRMLS_CC);
if (re == NULL) {
RETVAL_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
