[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Feb 6 01:32:49 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3310r2=1.3311diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3310 php-src/ChangeLog:1.3311 --- php-src/ChangeLog:1.3310Thu Feb 5 01:32:39 2009 +++ php-src/ChangeLog Fri Feb 6 01:32:48 2009 @@ -1,3 +1,59 @@ +2009-02-05 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_3) + NEWS: + - Fix crap + +2009-02-05 Christopher Jones christopher.jo...@oracle.com + +* ext/bz2/bz2_filter.c: + MFB: Make message punctuation consistent across PHP + +* (PHP_5_3) + ext/bz2/bz2_filter.c: + Make message punctuation consistent across PHP + +* (PHP_5_3) + ext/oci8/oci8_interface.c: + Tweak fix for #45458 to allow this branch (from PECL) to continue building + with PHP 4 et al. No other branches need changing + +2009-02-05 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + NEWS + configure.in + main/php_version.h: + + Back to dev + +* (PHP_5_2) + NEWS + configure.in + main/php_version.h: + + 5.2.9RC1 + +2009-02-05 Pierre-Alain Joye pierre@gmail.com + +* (PHP_5_2) + NEWS: + - zip fix entry + +* (PHP_5_2) + ext/zip/php_zip.c + ext/zip/php_zip.h: + - Fixed a crash on extract in zip when files or directories entry names + contain +a relative path. (affects only 5.2 as it is a limitation in 5.2's + virtual_file_ex) + +2009-02-05 Felipe Pena felipe...@gmail.com + +* EXTENSIONS + EXTENSIONS: + - Update + 2009-02-04 Felipe Pena felipe...@gmail.com * (PHP_5_2) @@ -29405,7 +29461,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3310 2009/02/05 01:32:39 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3311 2009/02/06 01:32:48 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
Re: [PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
On 03.02.2009 22:02, Greg Beaver wrote: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, sizeof(php_bz2_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., sizeof(php_bz2_filter_data)); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-inbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-inbuf_len); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-outbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-outbuf_len); Huh? Why add more dots? -- 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 / EXTENSIONS
felipe Thu Feb 5 13:45:58 2009 UTC Modified files: /php-srcEXTENSIONS Log: - Update http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.86r2=1.87diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.86 php-src/EXTENSIONS:1.87 --- php-src/EXTENSIONS:1.86 Thu Aug 7 15:29:24 2008 +++ php-src/EXTENSIONS Thu Feb 5 13:45:58 2009 @@ -129,24 +129,11 @@ STATUS: Working COMMENT: DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini --- -EXTENSION: dbase -MAINTENANCE: Orphaned -STATUS: Working -EXTENSION: fbsql -PRIMARY MAINTAINER: Frank M. Kromann f...@swwwing.com -MAINTENANCE: Unknown -STATUS: Unknown EXTENSION: interbase PRIMARY MAINTAINER: Ard Biesheuvel a...@ard.nu, Jouni Ahto jouni.a...@exdec.fi MAINTENANCE: Odd fixes STATUS: Working --- -EXTENSION: msql -MAINTENANCE: Unknown -STATUS: Working EXTENSION: mssql PRIMARY MAINTAINER: Frank M. Kromann f...@swwwing.com MAINTENANCE: Maintained -- 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) / EXTENSIONS
felipe Thu Feb 5 13:46:11 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcEXTENSIONS Log: - Update http://cvs.php.net/viewvc.cgi/php-src/EXTENSIONS?r1=1.72.2.4.2.4.2.11r2=1.72.2.4.2.4.2.12diff_format=u Index: php-src/EXTENSIONS diff -u php-src/EXTENSIONS:1.72.2.4.2.4.2.11 php-src/EXTENSIONS:1.72.2.4.2.4.2.12 --- php-src/EXTENSIONS:1.72.2.4.2.4.2.11Thu Aug 7 15:29:38 2008 +++ php-src/EXTENSIONS Thu Feb 5 13:46:11 2009 @@ -129,24 +129,11 @@ STATUS: Working COMMENT: DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini --- -EXTENSION: dbase -MAINTENANCE: Orphaned -STATUS: Working -EXTENSION: fbsql -PRIMARY MAINTAINER: Frank M. Kromann f...@swwwing.com -MAINTENANCE: Unknown -STATUS: Unknown EXTENSION: interbase PRIMARY MAINTAINER: Ard Biesheuvel a...@ard.nu, Jouni Ahto jouni.a...@exdec.fi MAINTENANCE: Odd fixes STATUS: Working --- -EXTENSION: msql -MAINTENANCE: Unknown -STATUS: Working EXTENSION: mssql PRIMARY MAINTAINER: Frank M. Kromann f...@swwwing.com MAINTENANCE: Maintained -- 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) / NEWS /ext/bz2 bz2_filter.c
Greg Beaver wrote:
cellog Tue Feb 3 18:56:26 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src NEWS
/php-src/ext/bz2 bz2_filter.c
Log:
Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress
after end of stream)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.484r2=1.2027.2.547.2.965.2.485diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.484
php-src/NEWS:1.2027.2.547.2.965.2.485
--- php-src/NEWS:1.2027.2.547.2.965.2.484 Tue Feb 3 18:29:25 2009
+++ php-src/NEWSTue Feb 3 18:56:25 2009
@@ -6,7 +6,8 @@
- Fixed bug #47085 (rename() returns true even if the file in PHAR does not
exist). (Greg)
- Fixed bug #47031 (Fix constants in DualIterator example). (Etienne)
- Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno)
-
+- Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress
after
+ end of stream). (Greg)
Re-Fixed ? Please don't invent stuff like this into NEWS. It's either
Fixed or not.
Also, why isn't this fix MFH'd to PHP_5_2?
--Jani
29 Jan 2009, PHP 5.3.0 Beta 1
- Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.3.2.2.2.5.2.6r2=1.3.2.2.2.5.2.7diff_format=u
Index: php-src/ext/bz2/bz2_filter.c
diff -u php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5.2.6
php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5.2.7
--- php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5.2.6Wed Dec 31 11:15:35 2008
+++ php-src/ext/bz2/bz2_filter.cTue Feb 3 18:56:26 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2_filter.c,v 1.3.2.2.2.5.2.6 2008/12/31 11:15:35 sebastian Exp $ */
+/* $Id: bz2_filter.c,v 1.3.2.2.2.5.2.7 2009/02/03 18:56:26 cellog Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -353,11 +353,14 @@
if (Z_TYPE_P(filterparams) == IS_ARRAY ||
Z_TYPE_P(filterparams) == IS_OBJECT) {
if (SUCCESS == zend_hash_find(HASH_OF(filterparams), concatenated, sizeof(concatenated), (void **) tmpzval) ) {
- SEPARATE_ZVAL(tmpzval);
- convert_to_boolean_ex(tmpzval);
- data-expect_concatenated =
Z_LVAL_PP(tmpzval);
- zval_ptr_dtor(tmpzval);
- tmpzval = NULL;
+ zval tmp, *tmp2;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(tmp);
+ tmp2 = tmp;
+ convert_to_boolean_ex(tmp2);
+ data-expect_concatenated = Z_LVAL(tmp);
+ tmpzval = NULL;
}
zend_hash_find(HASH_OF(filterparams), small, sizeof(small), (void **) tmpzval);
@@ -366,10 +369,13 @@
}
if (tmpzval) {
- SEPARATE_ZVAL(tmpzval);
- convert_to_boolean_ex(tmpzval);
- data-small_footprint = Z_LVAL_PP(tmpzval);
- zval_ptr_dtor(tmpzval);
+ zval tmp, *tmp2;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(tmp);
+ tmp2 = tmp;
+ convert_to_boolean_ex(tmp2);
+ data-small_footprint = Z_LVAL(tmp);
}
}
@@ -385,26 +391,31 @@
if (Z_TYPE_P(filterparams) == IS_ARRAY ||
Z_TYPE_P(filterparams) == IS_OBJECT) {
if (zend_hash_find(HASH_OF(filterparams), blocks,
sizeof(blocks), (void**) tmpzval) == SUCCESS) {
/* How much memory to allocate (1 - 9)
x 100kb */
- SEPARATE_ZVAL(tmpzval);
- convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) 1 ||
Z_LVAL_PP(tmpzval) 9) {
+ zval tmp;
+
+ tmp = **tmpzval;
+ zval_copy_ctor(tmp);
+ convert_to_long(tmp);
+ if (Z_LVAL(tmp) 1 || Z_LVAL(tmp) 9)
{
php_error_docref(NULL TSRMLS_CC,
E_WARNING, Invalid parameter given for number of blocks to allocate. (%ld),
Z_LVAL_PP(tmpzval));
} else {
- blockSize100k =
Re: [PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
Antony Dovgal wrote: On 03.02.2009 22:02, Greg Beaver wrote: -php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, sizeof(php_bz2_filter_data)); +php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., sizeof(php_bz2_filter_data)); -php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-inbuf_len); +php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-inbuf_len); -php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-outbuf_len); +php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-outbuf_len); Huh? Why add more dots? This was in PHP_5_3, no idea why it wasn't in HEAD, but it makes syncing easier if they're the same. I don't care either way whether they have periods or not, so feel free to revert if you feel strongly. Thanks, Greg -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
On Thu, 2009-02-05 at 08:56 -0600, Greg Beaver wrote: Antony Dovgal wrote: On 03.02.2009 22:02, Greg Beaver wrote: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, sizeof(php_bz2_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., sizeof(php_bz2_filter_data)); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-inbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-inbuf_len); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-outbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-outbuf_len); Huh? Why add more dots? This was in PHP_5_3, no idea why it wasn't in HEAD, but it makes syncing easier if they're the same. I don't care either way whether they have periods or not, so feel free to revert if you feel strongly. well, with dots they look like this in the end: Warning: Failed allocating %zu bytes. in foo.php on line 42 Which certainly looks wrong. Therefore we don't put dots in the end :-) 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_2) /ext/zip php_zip.c php_zip.h
pajoye Thu Feb 5 19:53:22 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zipphp_zip.c php_zip.h
Log:
- Fixed a crash on extract in zip when files or directories entry names
contain
a relative path. (affects only 5.2 as it is a limitation in 5.2's
virtual_file_ex)
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.48r2=1.1.2.49diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.48 php-src/ext/zip/php_zip.c:1.1.2.49
--- php-src/ext/zip/php_zip.c:1.1.2.48 Fri Jan 2 00:12:29 2009
+++ php-src/ext/zip/php_zip.c Thu Feb 5 19:53:22 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.1.2.48 2009/01/02 00:12:29 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.49 2009/02/05 19:53:22 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -31,6 +31,10 @@
#include lib/zip.h
#include lib/zipint.h
+#ifdef PHP_WIN32
+#include tsrm_virtual_cwd.h
+#endif
+
/* zip_open is a macro for renaming libzip zipopen, so we need to use
PHP_NAMED_FUNCTION */
static PHP_NAMED_FUNCTION(zif_zip_open);
static PHP_NAMED_FUNCTION(zif_zip_read);
@@ -86,6 +90,284 @@
# define add_ascii_assoc_long add_assoc_long
#endif
+static int php_zip_realpath_r(char *path, int start, int len, int *ll, time_t
*t, int use_realpath, int is_dir, int *link_is_dir TSRMLS_DC) /* {{{ */
+{
+ int i, j;
+ char *tmp;
+
+ while (1) {
+ if (len = start) {
+ return start;
+ }
+
+ i = len;
+ while (i start !IS_SLASH(path[i-1])) {
+ i--;
+ }
+
+ if (i == len ||
+ (i == len - 1 path[i] == '.')) {
+ /* remove double slashes and '.' */
+ len = i - 1;
+ is_dir = 1;
+ continue;
+ } else if (i == len - 2 path[i] == '.' path[i+1] == '.') {
+ /* remove '..' and previous directory */
+ if (i - 1 = start) {
+ return start ? start : len;
+ }
+ j = php_zip_realpath_r(path, start, i-1, ll, t,
use_realpath, 1, NULL TSRMLS_CC);
+ if (j start) {
+ j--;
+ while (j start !IS_SLASH(path[j])) {
+ j--;
+ }
+ if (!start) {
+ /* leading '..' must not be removed in
case of relative path */
+ if (j == 0 path[0] == '.' path[1]
== '.'
+ IS_SLASH(path[2])) {
+ path[3] = '.';
+ path[4] = '.';
+ path[5] = DEFAULT_SLASH;
+ j = 5;
+ } else if (j 0
+ path[j+1] == '.' path[j+2] ==
'.'
+ IS_SLASH(path[j+3])) {
+ j += 4;
+ path[j++] = '.';
+ path[j++] = '.';
+ path[j] = DEFAULT_SLASH;
+ }
+ }
+ } else if (!start !j) {
+ /* leading '..' must not be removed in case of
relative path */
+ path[0] = '.';
+ path[1] = '.';
+ path[2] = DEFAULT_SLASH;
+ j = 2;
+ }
+ return j;
+ }
+
+ path[len] = 0;
+
+#ifdef PHP_WIN32
+ tmp = tsrm_do_alloca(len+1);
+ memcpy(tmp, path, len+1);
+#elif defined(NETWARE)
+
+ tmp = tsrm_do_alloca(len+1);
+ memcpy(tmp, path, len+1);
+#else
+ tmp = tsrm_do_alloca(len+1);
+ memcpy(tmp, path, len+1);
+
+ {
+#endif
+ if (i - 1 = start) {
+ j = start;
+ } else {
+ /* some leading directories may be unaccessable
*/
+ j = php_zip_realpath_r(path, start, i-1, ll, t,
use_realpath, 1, NULL TSRMLS_CC);
+ if (j start) {
+ path[j++] = DEFAULT_SLASH;
+ }
+ }
+#ifdef
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
pajoye Thu Feb 5 19:53:44 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - zip fix entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1405r2=1.2027.2.547.2.1406diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1405 php-src/NEWS:1.2027.2.547.2.1406 --- php-src/NEWS:1.2027.2.547.2.1405Mon Feb 2 23:51:58 2009 +++ php-src/NEWSThu Feb 5 19:53:43 2009 @@ -7,6 +7,8 @@ - Added optional sorting type flag parameter to array_unique(). Default is SORT_REGULAR. (Andrei) +- Fixed a crash on extract in zip when files or directories entry names contain + a relative path. (Pierre) - Fixed error conditions handling in stream_filter_append(). (Arnaud) - Fixed zip filename property read. (Pierre) - Fixed explode() behavior with empty string to respect negative limit. (Shire) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Thu Feb 5 20:53:45 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.2.9RC1 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1406r2=1.2027.2.547.2.1407diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1406 php-src/NEWS:1.2027.2.547.2.1407 --- php-src/NEWS:1.2027.2.547.2.1406Thu Feb 5 19:53:43 2009 +++ php-src/NEWSThu Feb 5 20:53:44 2009 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.2.9 +02 Feb 2009, PHP 5.2.9RC1 - Changed __call() to be invoked on private/protected method access, similar to properties and __get(). (Andrei) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.122r2=1.579.2.52.2.123diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.122 php-src/configure.in:1.579.2.52.2.123 --- php-src/configure.in:1.579.2.52.2.122 Wed Feb 4 15:03:11 2009 +++ php-src/configure.inThu Feb 5 20:53:44 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.122 2009/02/04 15:03:11 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.123 2009/02/05 20:53:44 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=9 -PHP_EXTRA_VERSION=-dev +PHP_EXTRA_VERSION=RC1 PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.84r2=1.112.2.37.2.85diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.84 php-src/main/php_version.h:1.112.2.37.2.85 --- php-src/main/php_version.h:1.112.2.37.2.84 Sun Dec 7 19:28:01 2008 +++ php-src/main/php_version.h Thu Feb 5 20:53:45 2009 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.2.9-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.2.9RC1 #define PHP_VERSION_ID 50209 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Thu Feb 5 20:56:12 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1407r2=1.2027.2.547.2.1408diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1407 php-src/NEWS:1.2027.2.547.2.1408 --- php-src/NEWS:1.2027.2.547.2.1407Thu Feb 5 20:53:44 2009 +++ php-src/NEWSThu Feb 5 20:56:12 2009 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Feb 2009, PHP 5.2.9 + 02 Feb 2009, PHP 5.2.9RC1 - Changed __call() to be invoked on private/protected method access, similar to properties and __get(). (Andrei) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.123r2=1.579.2.52.2.124diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.123 php-src/configure.in:1.579.2.52.2.124 --- php-src/configure.in:1.579.2.52.2.123 Thu Feb 5 20:53:44 2009 +++ php-src/configure.inThu Feb 5 20:56:12 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.123 2009/02/05 20:53:44 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.124 2009/02/05 20:56:12 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=2 PHP_RELEASE_VERSION=9 -PHP_EXTRA_VERSION=RC1 +PHP_EXTRA_VERSION=RC2-dev PHP_VERSION=$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 1 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.85r2=1.112.2.37.2.86diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.85 php-src/main/php_version.h:1.112.2.37.2.86 --- php-src/main/php_version.h:1.112.2.37.2.85 Thu Feb 5 20:53:45 2009 +++ php-src/main/php_version.h Thu Feb 5 20:56:12 2009 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.2.9RC1 +#define PHP_EXTRA_VERSION RC2-dev +#define PHP_VERSION 5.2.9RC2-dev #define PHP_VERSION_ID 50209 -- 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) / NEWS /ext/bz2 bz2_filter.c
Jani Taskinen wrote: Greg Beaver wrote: cellogTue Feb 3 18:56:26 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/bz2bz2_filter.c Log: Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after end of stream) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.484r2=1.2027.2.547.2.965.2.485diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.484 php-src/NEWS:1.2027.2.547.2.965.2.485 --- php-src/NEWS:1.2027.2.547.2.965.2.484Tue Feb 3 18:29:25 2009 +++ php-src/NEWSTue Feb 3 18:56:25 2009 @@ -6,7 +6,8 @@ - Fixed bug #47085 (rename() returns true even if the file in PHAR does not exist). (Greg) - Fixed bug #47031 (Fix constants in DualIterator example). (Etienne) - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) - +- Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after + end of stream). (Greg) Re-Fixed ? Please don't invent stuff like this into NEWS. It's either Fixed or not. sorry for offending your delicate sensibilities. Feel free to Re-Commit with the corrected name for Fixed. Also, why isn't this fix MFH'd to PHP_5_2? The original fix was merged, minus the feature addition, but 5.2 went RC yesterday, so I didn't think it wise to randomly commit. Any other questions? -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
Johannes Schlüter wrote: On Thu, 2009-02-05 at 08:56 -0600, Greg Beaver wrote: Antony Dovgal wrote: On 03.02.2009 22:02, Greg Beaver wrote: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, sizeof(php_bz2_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., sizeof(php_bz2_filter_data)); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-inbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-inbuf_len); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-outbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-outbuf_len); Huh? Why add more dots? This was in PHP_5_3, no idea why it wasn't in HEAD, but it makes syncing easier if they're the same. I don't care either way whether they have periods or not, so feel free to revert if you feel strongly. well, with dots they look like this in the end: Warning: Failed allocating %zu bytes. in foo.php on line 42 Which certainly looks wrong. Therefore we don't put dots in the end :-) johannes I really don't give a crap. Change it if you want, I was merging *existing* code in PHP_5_3 to HEAD, not adding new stuff. For the record, this code was added on July 20, 2004 to bz2_filter.c. (http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.1r2=1.2pathrev=PHP_5_1;) The main problem appears to be that the error message clean-up in http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.9r2=1.10 was never merged back to PHP 5. I sure am glad we worked this out, can you imagine the horrors? Security experts would be blogging endlessly about those periods I added back into the error messages. What a disgrace to the language I am. In the future, I'll be really careful never to merge missing features back to HEAD again, sorry about that. Greg -- 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/oci8 oci8_interface.c
sixdThu Feb 5 21:43:31 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8_interface.c
Log:
Tweak fix for #45458 to allow this branch (from PECL) to continue building
with PHP 4 et al. No other branches need changing
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.13.2.9r2=1.8.2.7.2.13.2.10diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.9
php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.10
--- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.13.2.9 Wed Dec 31 11:15:39 2008
+++ php-src/ext/oci8/oci8_interface.c Thu Feb 5 21:43:31 2009
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_interface.c,v 1.8.2.7.2.13.2.9 2008/12/31 11:15:39 sebastian Exp
$ */
+/* $Id: oci8_interface.c,v 1.8.2.7.2.13.2.10 2009/02/05 21:43:31 sixd Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1399,7 +1399,13 @@
if (flags PHP_OCI_NUM) {
zend_hash_next_index_insert(Z_ARRVAL_P(row), element, sizeof(zval*), NULL);
} else { /* default to ASSOC */
+#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION
5)
+ /* zend_symtable_update is only
available in 5.2+ */
zend_symtable_update(Z_ARRVAL_P(row),
columns[ i ]-name, columns[ i ]-name_len+1, element, sizeof(zval*), NULL);
+#else
+ /* This code path means Bug #45458 will
remain broken when OCI8 is built with PHP 4 */
+ zend_hash_update(Z_ARRVAL_P(row),
columns[ i ]-name, columns[ i ]-name_len+1, element, sizeof(zval*), NULL);
+#endif
}
}
@@ -1431,7 +1437,13 @@
MAKE_STD_ZVAL(tmp);
array_init(tmp);
+#if (PHP_MAJOR_VERSION == 5 PHP_MINOR_VERSION 1) || (PHP_MAJOR_VERSION
5)
+ /* zend_symtable_update is only available in
5.2+ */
zend_symtable_update(Z_ARRVAL_P(array),
columns[ i ]-name, columns[ i ]-name_len+1, (void *) tmp, sizeof(zval*),
(void **) (outarrs[ i ]));
+#else
+ /* This code path means Bug #45458 will remain
broken when OCI8 is built with PHP 4 */
+ zend_hash_update(Z_ARRVAL_P(array), columns[ i
]-name, columns[ i ]-name_len+1, (void *) tmp, sizeof(zval*), (void **)
(outarrs[ i ]));
+#endif
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/bz2 bz2_filter.c
sixdThu Feb 5 21:45:43 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/bz2bz2_filter.c
Log:
Make message punctuation consistent across PHP
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.3.2.2.2.5.2.7r2=1.3.2.2.2.5.2.8diff_format=u
Index: php-src/ext/bz2/bz2_filter.c
diff -u php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5.2.7
php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5.2.8
--- php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5.2.7Tue Feb 3 18:56:26 2009
+++ php-src/ext/bz2/bz2_filter.cThu Feb 5 21:45:43 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2_filter.c,v 1.3.2.2.2.5.2.7 2009/02/03 18:56:26 cellog Exp $ */
+/* $Id: bz2_filter.c,v 1.3.2.2.2.5.2.8 2009/02/05 21:45:43 sixd Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -317,7 +317,7 @@
/* Create this filter */
data = pecalloc(1, sizeof(php_bz2_filter_data), persistent);
if (!data) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes., sizeof(php_bz2_filter_data));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes, sizeof(php_bz2_filter_data));
return NULL;
}
@@ -330,14 +330,14 @@
data-strm.avail_out = data-outbuf_len = data-inbuf_len = 2048;
data-strm.next_in = data-inbuf = (char *) pemalloc(data-inbuf_len,
persistent);
if (!data-inbuf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes., data-inbuf_len);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes, data-inbuf_len);
pefree(data, persistent);
return NULL;
}
data-strm.avail_in = 0;
data-strm.next_out = data-outbuf = (char *)
pemalloc(data-outbuf_len, persistent);
if (!data-outbuf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes., data-outbuf_len);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes, data-outbuf_len);
pefree(data-inbuf, persistent);
pefree(data, persistent);
return NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
Greg Beaver wrote: Johannes Schlüter wrote: On Thu, 2009-02-05 at 08:56 -0600, Greg Beaver wrote: Antony Dovgal wrote: On 03.02.2009 22:02, Greg Beaver wrote: - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, sizeof(php_bz2_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., sizeof(php_bz2_filter_data)); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-inbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-inbuf_len); - php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes, data-outbuf_len); + php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating %zu bytes., data-outbuf_len); Huh? Why add more dots? This was in PHP_5_3, no idea why it wasn't in HEAD, but it makes syncing easier if they're the same. I don't care either way whether they have periods or not, so feel free to revert if you feel strongly. well, with dots they look like this in the end: Warning: Failed allocating %zu bytes. in foo.php on line 42 Which certainly looks wrong. Therefore we don't put dots in the end :-) johannes I really don't give a crap. Change it if you want, I was merging *existing* code in PHP_5_3 to HEAD, not adding new stuff. It's no big deal. It caught my eye originally too, so I'll make the changes. Chris -- Email: christopher.jo...@oracle.com Tel: +1 650 506 8630 Twitter: http://twitter.com/ghrdFree PHP Book: http://tinyurl.com/UGPOM -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
sixdThu Feb 5 21:48:31 2009 UTC
Modified files:
/php-src/ext/bz2bz2_filter.c
Log:
MFB: Make message punctuation consistent across PHP
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.20r2=1.21diff_format=u
Index: php-src/ext/bz2/bz2_filter.c
diff -u php-src/ext/bz2/bz2_filter.c:1.20 php-src/ext/bz2/bz2_filter.c:1.21
--- php-src/ext/bz2/bz2_filter.c:1.20 Tue Feb 3 19:02:41 2009
+++ php-src/ext/bz2/bz2_filter.cThu Feb 5 21:48:31 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2_filter.c,v 1.20 2009/02/03 19:02:41 cellog Exp $ */
+/* $Id: bz2_filter.c,v 1.21 2009/02/05 21:48:31 sixd Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -333,7 +333,7 @@
/* Create this filter */
data = pecalloc(1, sizeof(php_bz2_filter_data), persistent);
if (!data) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes., sizeof(php_bz2_filter_data));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes, sizeof(php_bz2_filter_data));
return NULL;
}
@@ -346,14 +346,14 @@
data-strm.avail_out = data-outbuf_len = data-inbuf_len = 2048;
data-strm.next_in = data-inbuf = (char *) pemalloc(data-inbuf_len,
persistent);
if (!data-inbuf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes., data-inbuf_len);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes, data-inbuf_len);
pefree(data, persistent);
return NULL;
}
data-strm.avail_in = 0;
data-strm.next_out = data-outbuf = (char *)
pemalloc(data-outbuf_len, persistent);
if (!data-outbuf) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes., data-outbuf_len);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Failed allocating
%zu bytes, data-outbuf_len);
pefree(data-inbuf, persistent);
pefree(data, persistent);
return NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
On Thu, Feb 5, 2009 at 10:32 PM, Greg Beaver g...@chiaraquartet.net wrote: I sure am glad we worked this out, can you imagine the horrors? Security experts would be blogging endlessly about those periods I added back into the error messages. What a disgrace to the language I am. In the future, I'll be really careful never to merge missing features back to HEAD again, sorry about that. Come on, there is no need to make such noises about dots. We cleaned much of them and it is normal than when some resistant dots are found, one will ask to remove them. And we usually ask the commiter, you in this case (the amount of work for the commit itself is not relevant, the dots must die! :-) Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- 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) / NEWS /ext/bz2 bz2_filter.c
Greg Beaver kirjoitti: Jani Taskinen wrote: Greg Beaver wrote: cellogTue Feb 3 18:56:26 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/bz2bz2_filter.c Log: Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after end of stream) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.484r2=1.2027.2.547.2.965.2.485diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.484 php-src/NEWS:1.2027.2.547.2.965.2.485 --- php-src/NEWS:1.2027.2.547.2.965.2.484Tue Feb 3 18:29:25 2009 +++ php-src/NEWSTue Feb 3 18:56:25 2009 @@ -6,7 +6,8 @@ - Fixed bug #47085 (rename() returns true even if the file in PHAR does not exist). (Greg) - Fixed bug #47031 (Fix constants in DualIterator example). (Etienne) - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) - +- Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after + end of stream). (Greg) Re-Fixed ? Please don't invent stuff like this into NEWS. It's either Fixed or not. sorry for offending your delicate sensibilities. Feel free to Re-Commit with the corrected name for Fixed. Also, why isn't this fix MFH'd to PHP_5_2? The original fix was merged, minus the feature addition, but 5.2 went RC yesterday, so I didn't think it wise to randomly commit. Any other questions? Yes, did your gerbil die or what's with the attitude? --Jani -- 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
janiThu Feb 5 23:59:17 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Fix crap http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.486r2=1.2027.2.547.2.965.2.487diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.486 php-src/NEWS:1.2027.2.547.2.965.2.487 --- php-src/NEWS:1.2027.2.547.2.965.2.486 Tue Feb 3 21:45:19 2009 +++ php-src/NEWSThu Feb 5 23:59:17 2009 @@ -6,7 +6,7 @@ - Fixed bug #47085 (rename() returns true even if the file in PHAR does not exist). (Greg) - Fixed bug #47031 (Fix constants in DualIterator example). (Etienne) - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) -- Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after +- Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after end of stream). (Greg) - Fixed bug #46048 (SimpleXML top-level @attributes not part of iterator). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/bz2 bz2_filter.c
Christopher Jones wrote: It's no big deal. It caught my eye originally too, so I'll make the changes. Thanks Chris -- 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) / NEWS /ext/bz2 bz2_filter.c
Jani Taskinen wrote: Greg Beaver kirjoitti: Jani Taskinen wrote: Greg Beaver wrote: cellogTue Feb 3 18:56:26 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS /php-src/ext/bz2bz2_filter.c Log: Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after end of stream) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.484r2=1.2027.2.547.2.965.2.485diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.484 php-src/NEWS:1.2027.2.547.2.965.2.485 --- php-src/NEWS:1.2027.2.547.2.965.2.484Tue Feb 3 18:29:25 2009 +++ php-src/NEWSTue Feb 3 18:56:25 2009 @@ -6,7 +6,8 @@ - Fixed bug #47085 (rename() returns true even if the file in PHAR does not exist). (Greg) - Fixed bug #47031 (Fix constants in DualIterator example). (Etienne) - Fixed bug #46347 (parse_ini_file() doesn't support * in keys). (Nuno) - +- Re-Fixed bug #46026 (bz2.decompress/zlib.inflate filter tries to decompress after + end of stream). (Greg) Re-Fixed ? Please don't invent stuff like this into NEWS. It's either Fixed or not. sorry for offending your delicate sensibilities. Feel free to Re-Commit with the corrected name for Fixed. Also, why isn't this fix MFH'd to PHP_5_2? The original fix was merged, minus the feature addition, but 5.2 went RC yesterday, so I didn't think it wise to randomly commit. Any other questions? Yes, did your gerbil die or what's with the attitude? :) perhaps it's the barrage of nit-picking messages from 3 different people over insignificant details (and then the yeah replies) when the fix itself was a bit of work in the first place? It's all right though, I know that none of us can help being smug when others mess up, I do the same thing in my own special way. -- 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/mbfl mbfilter.c /ext/mbstring/tests bug45239.phpt
moriyoshi Fri Feb 6 07:32:44 2009 UTC
Added files:
/php-src/ext/mbstring/tests bug45239.phpt
Modified files:
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
- Fix bug #45239 (encoding detector hangs with mbstring.strict_detection
enabled).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.15r2=1.16diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.15
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.16
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.15 Fri Aug 1 22:55:47 2008
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Feb 6 07:32:44 2009
@@ -462,10 +462,9 @@
while (n = 0) {
filter = identd-filter_list[n];
if (!filter-flag) {
- if (identd-strict filter-status) {
- continue;
+ if (!identd-strict || !filter-status) {
+ encoding =
filter-encoding-no_encoding;
}
- encoding = filter-encoding-no_encoding;
}
n--;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug45239.phpt?view=markuprev=1.1
Index: php-src/ext/mbstring/tests/bug45239.phpt
+++ php-src/ext/mbstring/tests/bug45239.phpt
--TEST--
Bug #45239 (encoding detector hangs with mbstring.strict_detection enabled)
--INI--
mbstring.strict_detection=1
mbstring.http_input=UTF-8
mbstring.internal_encoding=UTF-8
--SKIPIF--
?php
extension_loaded('mbstring') or die('skip');
?
--FILE--
?php
mb_internal_encoding(utf-8);
mb_parse_str(a=%fc, $dummy);
var_dump(mb_http_input());
?
--EXPECT--
string(5) UTF-8
--
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/mbfl mbfilter.c /ext/mbstring/tests bug45239.phpt
moriyoshi Fri Feb 6 07:33:25 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mbstring/tests bug45239.phpt
Modified files:
/php-src/ext/mbstring/libmbfl/mbfl mbfilter.c
Log:
* MFH: Fix bug #45239 (encoding detector hangs with mbstring.strict_detection
enabled).
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c?r1=1.7.2.5.2.1.2.1r2=1.7.2.5.2.1.2.2diff_format=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.1.2.1
php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.1.2.2
--- php-src/ext/mbstring/libmbfl/mbfl/mbfilter.c:1.7.2.5.2.1.2.1Fri Aug
1 22:56:47 2008
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfilter.cFri Feb 6 07:33:25 2009
@@ -462,10 +462,9 @@
while (n = 0) {
filter = identd-filter_list[n];
if (!filter-flag) {
- if (identd-strict filter-status) {
- continue;
+ if (!identd-strict || !filter-status) {
+ encoding =
filter-encoding-no_encoding;
}
- encoding = filter-encoding-no_encoding;
}
n--;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug45239.phpt?view=markuprev=1.1
Index: php-src/ext/mbstring/tests/bug45239.phpt
+++ php-src/ext/mbstring/tests/bug45239.phpt
--TEST--
Bug #45239 (encoding detector hangs with mbstring.strict_detection enabled)
--INI--
mbstring.strict_detection=1
mbstring.http_input=UTF-8
mbstring.internal_encoding=UTF-8
--SKIPIF--
?php
extension_loaded('mbstring') or die('skip');
?
--FILE--
?php
mb_internal_encoding(utf-8);
mb_parse_str(a=%fc, $dummy);
var_dump(mb_http_input());
?
--EXPECT--
string(5) UTF-8
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
