[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pdo_sqlite/tests bug43831.phpt
felipe Fri Feb 13 02:20:52 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pdo_sqlite/tests bug43831.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug43831.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug43831.phpt
+++ php-src/ext/pdo_sqlite/tests/bug43831.phpt
--TEST--
Bug #43831 ($this gets mangled when extending PDO with persistent connection)
--FILE--
true));
}
}
class Baz extends PDO {
function __construct($dsn) {
parent::__construct($dsn, null, null,
array(PDO::ATTR_PERSISTENT => true));
}
}
class Bar extends Baz {
function quux() {
echo get_class($this), "\n";
$foo = new Foo("sqlite::memory:");
echo get_class($this), "\n";
}
}
$bar = new Bar("sqlite::memory:");
$bar->quux();
class MyPDO extends PDO {}
$bar = new PDO("sqlite::memory:", null, null, array(PDO::ATTR_PERSISTENT =>
true));
$baz = new MyPDO("sqlite::memory:", null, null, array(PDO::ATTR_PERSISTENT =>
true));
var_dump($bar);
unset($bar);
var_dump($baz);
var_dump($bar);
?>
--EXPECTF--
Bar
Bar
object(MyPDO)#%d (0) {
}
object(MyPDO)#%d (0) {
}
Notice: Undefined variable: bar in %s on line %d
NULL
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_sqlite/tests bug43831.phpt
felipe Fri Feb 13 02:20:31 2009 UTC
Added files:
/php-src/ext/pdo_sqlite/tests bug43831.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug43831.phpt?view=markup&rev=1.1
Index: php-src/ext/pdo_sqlite/tests/bug43831.phpt
+++ php-src/ext/pdo_sqlite/tests/bug43831.phpt
--TEST--
Bug #43831 ($this gets mangled when extending PDO with persistent connection)
--FILE--
true));
}
}
class Baz extends PDO {
function __construct($dsn) {
parent::__construct($dsn, null, null,
array(PDO::ATTR_PERSISTENT => true));
}
}
class Bar extends Baz {
function quux() {
echo get_class($this), "\n";
$foo = new Foo("sqlite::memory:");
echo get_class($this), "\n";
}
}
$bar = new Bar("sqlite::memory:");
$bar->quux();
class MyPDO extends PDO {}
$bar = new PDO("sqlite::memory:", null, null, array(PDO::ATTR_PERSISTENT =>
true));
$baz = new MyPDO("sqlite::memory:", null, null, array(PDO::ATTR_PERSISTENT =>
true));
var_dump($bar);
unset($bar);
var_dump($baz);
var_dump($bar);
?>
--EXPECTF--
Bar
Bar
object(MyPDO)#%d (0) {
}
object(MyPDO)#%d (0) {
}
Notice: Undefined variable: bar in %s on line %d
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/pdo pdo_dbh.c
felipe Fri Feb 13 02:18:57 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdopdo_dbh.c
Log:
MFH:
- Fixed bug #43831 ($this gets mangled when extending PDO with persistent
connection)
- Fixed bug #45432 (PDO: persistent connection leak)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.19&r2=1.82.2.31.2.17.2.20&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.19
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.20
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.19 Wed Dec 31 11:15:40 2008
+++ php-src/ext/pdo/pdo_dbh.c Fri Feb 13 02:18:57 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.19 2008/12/31 11:15:40 sebastian Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.20 2009/02/13 02:18:57 felipe Exp $ */
/* The PDO Database Handle Class */
@@ -328,23 +328,27 @@
memcpy((char *)pdbh->persistent_id, hashkey,
plen+1);
pdbh->persistent_id_len = plen+1;
pdbh->refcount = 1;
+ pdbh->properties = NULL;
}
}
if (pdbh) {
/* let's copy the emalloc bits over from the other
handle */
- pdbh->ce = dbh->ce;
- pdbh->def_stmt_ce = dbh->def_stmt_ce;
- pdbh->def_stmt_ctor_args = dbh->def_stmt_ctor_args;
- pdbh->properties = dbh->properties;
+ if (pdbh->properties) {
+ zend_hash_destroy(dbh->properties);
+ efree(dbh->properties);
+ } else {
+ pdbh->ce = dbh->ce;
+ pdbh->def_stmt_ce = dbh->def_stmt_ce;
+ pdbh->def_stmt_ctor_args =
dbh->def_stmt_ctor_args;
+ pdbh->properties = dbh->properties;
+ }
/* kill the non-persistent thingamy */
efree(dbh);
/* switch over to the persistent one */
dbh = pdbh;
zend_object_store_set_object(object, dbh TSRMLS_CC);
- if (!call_factory) {
- dbh->refcount++;
- }
+ dbh->refcount++;
}
if (hashkey) {
@@ -352,11 +356,13 @@
}
}
- dbh->data_source_len = strlen(colon + 1);
- dbh->data_source = (const char*)pestrdup(colon + 1, is_persistent);
- dbh->username = username ? pestrdup(username, is_persistent) : NULL;
- dbh->password = password ? pestrdup(password, is_persistent) : NULL;
- dbh->default_fetch_type = PDO_FETCH_BOTH;
+ if (call_factory) {
+ dbh->data_source_len = strlen(colon + 1);
+ dbh->data_source = (const char*)pestrdup(colon + 1,
is_persistent);
+ dbh->username = username ? pestrdup(username, is_persistent) :
NULL;
+ dbh->password = password ? pestrdup(password, is_persistent) :
NULL;
+ dbh->default_fetch_type = PDO_FETCH_BOTH;
+ }
dbh->auto_commit = pdo_attr_lval(options, PDO_ATTR_AUTOCOMMIT, 1
TSRMLS_CC);
@@ -1526,11 +1532,10 @@
dbh->properties = NULL;
}
- if (!dbh->is_persistent) {
- dbh_free(dbh TSRMLS_CC);
- } else if (dbh->methods && dbh->methods->persistent_shutdown) {
+ if (dbh->is_persistent && dbh->methods &&
dbh->methods->persistent_shutdown) {
dbh->methods->persistent_shutdown(dbh TSRMLS_CC);
}
+ dbh_free(dbh TSRMLS_CC);
}
zend_object_value pdo_dbh_new(zend_class_entry *ce TSRMLS_DC)
--
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_dbh.c
felipe Fri Feb 13 02:18:04 2009 UTC
Modified files:
/php-src/ext/pdopdo_dbh.c
Log:
- Fixed bug #43831 ($this gets mangled when extending PDO with persistent
connection)
- Fixed bug #45432 (PDO: persistent connection leak)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.159&r2=1.160&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.159 php-src/ext/pdo/pdo_dbh.c:1.160
--- php-src/ext/pdo/pdo_dbh.c:1.159 Wed Dec 31 11:12:34 2008
+++ php-src/ext/pdo/pdo_dbh.c Fri Feb 13 02:18:04 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.159 2008/12/31 11:12:34 sebastian Exp $ */
+/* $Id: pdo_dbh.c,v 1.160 2009/02/13 02:18:04 felipe Exp $ */
/* The PDO Database Handle Class */
@@ -328,23 +328,27 @@
memcpy((char *)pdbh->persistent_id, hashkey,
plen+1);
pdbh->persistent_id_len = plen+1;
pdbh->refcount = 1;
+ pdbh->properties = NULL;
}
}
if (pdbh) {
/* let's copy the emalloc bits over from the other
handle */
- pdbh->ce = dbh->ce;
- pdbh->def_stmt_ce = dbh->def_stmt_ce;
- pdbh->def_stmt_ctor_args = dbh->def_stmt_ctor_args;
- pdbh->properties = dbh->properties;
+ if (pdbh->properties) {
+ zend_hash_destroy(dbh->properties);
+ efree(dbh->properties);
+ } else {
+ pdbh->ce = dbh->ce;
+ pdbh->def_stmt_ce = dbh->def_stmt_ce;
+ pdbh->def_stmt_ctor_args =
dbh->def_stmt_ctor_args;
+ pdbh->properties = dbh->properties;
+ }
/* kill the non-persistent thingamy */
efree(dbh);
/* switch over to the persistent one */
dbh = pdbh;
zend_object_store_set_object(object, dbh TSRMLS_CC);
- if (!call_factory) {
- dbh->refcount++;
- }
+ dbh->refcount++;
}
if (hashkey) {
@@ -352,11 +356,13 @@
}
}
- dbh->data_source_len = strlen(colon + 1);
- dbh->data_source = (const char*)pestrdup(colon + 1, is_persistent);
- dbh->username = username ? pestrdup(username, is_persistent) : NULL;
- dbh->password = password ? pestrdup(password, is_persistent) : NULL;
- dbh->default_fetch_type = PDO_FETCH_BOTH;
+ if (call_factory) {
+ dbh->data_source_len = strlen(colon + 1);
+ dbh->data_source = (const char*)pestrdup(colon + 1,
is_persistent);
+ dbh->username = username ? pestrdup(username, is_persistent) :
NULL;
+ dbh->password = password ? pestrdup(password, is_persistent) :
NULL;
+ dbh->default_fetch_type = PDO_FETCH_BOTH;
+ }
dbh->auto_commit = pdo_attr_lval(options, PDO_ATTR_AUTOCOMMIT, 1
TSRMLS_CC);
@@ -1520,11 +1526,10 @@
dbh->properties = NULL;
}
- if (!dbh->is_persistent) {
- dbh_free(dbh TSRMLS_CC);
- } else if (dbh->methods && dbh->methods->persistent_shutdown) {
+ if (dbh->is_persistent && dbh->methods &&
dbh->methods->persistent_shutdown) {
dbh->methods->persistent_shutdown(dbh TSRMLS_CC);
}
+ dbh_free(dbh TSRMLS_CC);
}
zend_object_value pdo_dbh_new(zend_class_entry *ce TSRMLS_DC)
--
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 12 20:32:18 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/main php_version.h /php-srcconfigure.in NEWS Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.87&r2=1.112.2.37.2.88&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.87 php-src/main/php_version.h:1.112.2.37.2.88 --- php-src/main/php_version.h:1.112.2.37.2.87 Thu Feb 12 20:29:36 2009 +++ php-src/main/php_version.h Thu Feb 12 20:32:17 2009 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION "RC2" -#define PHP_VERSION "5.2.9RC2" +#define PHP_EXTRA_VERSION "RC3-dev" +#define PHP_VERSION "5.2.9RC3-dev" #define PHP_VERSION_ID 50209 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.127&r2=1.579.2.52.2.128&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.127 php-src/configure.in:1.579.2.52.2.128 --- php-src/configure.in:1.579.2.52.2.127 Thu Feb 12 20:29:36 2009 +++ php-src/configure.inThu Feb 12 20:32:17 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.127 2009/02/12 20:29:36 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.128 2009/02/12 20:32:17 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="RC2" +PHP_EXTRA_VERSION="RC3-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/NEWS?r1=1.2027.2.547.2.1415&r2=1.2027.2.547.2.1416&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1415 php-src/NEWS:1.2027.2.547.2.1416 --- php-src/NEWS:1.2027.2.547.2.1415Thu Feb 12 20:29:35 2009 +++ php-src/NEWSThu Feb 12 20:32:17 2009 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? Feb 2009, PHP 5.2.9 + 12 Feb 2009, PHP 5.2.9RC2 - Fixed bug #47353 (crash when creating a lot of objects in object destructor). (Tony) -- 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 12 20:29:36 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.2.9RC2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1414&r2=1.2027.2.547.2.1415&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1414 php-src/NEWS:1.2027.2.547.2.1415 --- php-src/NEWS:1.2027.2.547.2.1414Thu Feb 12 18:32:14 2009 +++ php-src/NEWSThu Feb 12 20:29:35 2009 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Feb 2009, PHP 5.2.9 +12 Feb 2009, PHP 5.2.9RC2 - Fixed bug #47353 (crash when creating a lot of objects in object destructor). (Tony) - Fixed bug #47322 (sscanf %d doesn't work). (Felipe) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.126&r2=1.579.2.52.2.127&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.126 php-src/configure.in:1.579.2.52.2.127 --- php-src/configure.in:1.579.2.52.2.126 Wed Feb 11 09:11:35 2009 +++ php-src/configure.inThu Feb 12 20:29:36 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.126 2009/02/11 09:11:35 tony2001 Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.127 2009/02/12 20:29:36 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="RC2-dev" +PHP_EXTRA_VERSION="RC2" 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.86&r2=1.112.2.37.2.87&diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.86 php-src/main/php_version.h:1.112.2.37.2.87 --- php-src/main/php_version.h:1.112.2.37.2.86 Thu Feb 5 20:56:12 2009 +++ php-src/main/php_version.h Thu Feb 12 20:29:36 2009 @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION "RC2-dev" -#define PHP_VERSION "5.2.9RC2-dev" +#define PHP_EXTRA_VERSION "RC2" +#define PHP_VERSION "5.2.9RC2" #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 /ext/unicode php_unicode.h ZendEngine2 zend_strtod.c zend_unicode.h
moriyoshi Thu Feb 12 20:04:59 2009 UTC Modified files: /ZendEngine2zend_strtod.c zend_unicode.h /php-src/ext/unicodephp_unicode.h Log: - Remove dependencies on ustdio.h. Doing so allows HEAD to be built with ICU that comes with the out-of-the-box Mac OS X. http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_strtod.c?r1=1.40&r2=1.41&diff_format=u Index: ZendEngine2/zend_strtod.c diff -u ZendEngine2/zend_strtod.c:1.40 ZendEngine2/zend_strtod.c:1.41 --- ZendEngine2/zend_strtod.c:1.40 Tue Dec 2 16:03:30 2008 +++ ZendEngine2/zend_strtod.c Thu Feb 12 20:04:59 2009 @@ -89,11 +89,10 @@ * directly -- and assumed always to succeed. */ -/* $Id: zend_strtod.c,v 1.40 2008/12/02 16:03:30 cseiler Exp $ */ +/* $Id: zend_strtod.c,v 1.41 2009/02/12 20:04:59 moriyoshi Exp $ */ #include #include -#include #include #include http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_unicode.h?r1=1.29&r2=1.30&diff_format=u Index: ZendEngine2/zend_unicode.h diff -u ZendEngine2/zend_unicode.h:1.29 ZendEngine2/zend_unicode.h:1.30 --- ZendEngine2/zend_unicode.h:1.29 Wed Dec 31 11:12:29 2008 +++ ZendEngine2/zend_unicode.h Thu Feb 12 20:04:59 2009 @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include http://cvs.php.net/viewvc.cgi/php-src/ext/unicode/php_unicode.h?r1=1.16&r2=1.17&diff_format=u Index: php-src/ext/unicode/php_unicode.h diff -u php-src/ext/unicode/php_unicode.h:1.16 php-src/ext/unicode/php_unicode.h:1.17 --- php-src/ext/unicode/php_unicode.h:1.16 Wed Jan 30 09:56:22 2008 +++ php-src/ext/unicode/php_unicode.h Thu Feb 12 20:04:59 2009 @@ -14,7 +14,7 @@ +--+ */ -/* $Id: php_unicode.h,v 1.16 2008/01/30 09:56:22 dmitry Exp $ */ +/* $Id: php_unicode.h,v 1.17 2009/02/12 20:04:59 moriyoshi Exp $ */ #ifndef PHP_UNICODE_H #define PHP_UNICODE_H @@ -31,6 +31,8 @@ #include #include +#include +#include #include extern zend_module_entry unicode_module_entry; -- 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 array.c
moriyoshi Thu Feb 12 18:57:55 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
Log:
* MFH: Fix bug #47370 (BC breakage of array_unique())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.51&r2=1.308.2.21.2.37.2.52&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.51
php-src/ext/standard/array.c:1.308.2.21.2.37.2.52
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.51 Mon Feb 9 10:47:09 2009
+++ php-src/ext/standard/array.cThu Feb 12 18:57:55 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.51 2009/02/09 10:47:09 dmitry Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.52 2009/02/12 18:57:55 moriyoshi Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2697,7 +2697,7 @@
};
struct bucketindex *arTmp, *cmpdata, *lastkept;
unsigned int i;
- long sort_type = PHP_SORT_REGULAR;
+ long sort_type = PHP_SORT_STRING;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|l", &array,
&sort_type) == FAILURE) {
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
moriyoshi Thu Feb 12 18:32:15 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: * Update for bug #47370. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1413&r2=1.2027.2.547.2.1414&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1413 php-src/NEWS:1.2027.2.547.2.1414 --- php-src/NEWS:1.2027.2.547.2.1413Wed Feb 11 09:58:58 2009 +++ php-src/NEWSThu Feb 12 18:32:14 2009 @@ -12,7 +12,7 @@ properties and __get(). (Andrei) - Added optional sorting type flag parameter to array_unique(). Default is - SORT_REGULAR. (Andrei) + SORT_STRING. (Andrei) - Fixed a crash on extract in zip when files or directories entry names contain a relative path. (Pierre) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c
moriyoshi Thu Feb 12 18:30:32 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c
Log:
* MFH: Fix bug #47370 (BC breakage of array_unique())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.63&r2=1.308.2.21.2.64&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.63
php-src/ext/standard/array.c:1.308.2.21.2.64
--- php-src/ext/standard/array.c:1.308.2.21.2.63Wed Dec 31 11:17:44 2008
+++ php-src/ext/standard/array.cThu Feb 12 18:30:31 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.63 2008/12/31 11:17:44 sebastian Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.64 2009/02/12 18:30:31 moriyoshi Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2839,7 +2839,7 @@
};
struct bucketindex *arTmp, *cmpdata, *lastkept;
unsigned int i;
- long sort_type = SORT_REGULAR;
+ long sort_type = SORT_STRING;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|l", &array,
&sort_type) == 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/standard array.c
moriyoshi Thu Feb 12 18:29:15 2009 UTC
Modified files:
/php-src/ext/standard array.c
Log:
* Fix bug #47370 (BC breakage of array_unique())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.471&r2=1.472&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.471 php-src/ext/standard/array.c:1.472
--- php-src/ext/standard/array.c:1.471 Mon Feb 9 10:47:19 2009
+++ php-src/ext/standard/array.cThu Feb 12 18:29:15 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.471 2009/02/09 10:47:19 dmitry Exp $ */
+/* $Id: array.c,v 1.472 2009/02/12 18:29:15 moriyoshi Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -2924,7 +2924,7 @@
};
struct bucketindex *arTmp, *cmpdata, *lastkept;
unsigned int i;
- long sort_type = PHP_SORT_REGULAR;
+ long sort_type = PHP_SORT_STRING;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|l", &array,
&sort_type) == FAILURE) {
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-dist php.ini-recommended
kalle Thu Feb 12 14:37:27 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Fixed wrong usage of error_reporting directive http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.26&r2=1.231.2.10.2.27&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.26 php-src/php.ini-dist:1.231.2.10.2.27 --- php-src/php.ini-dist:1.231.2.10.2.26Sat Jan 31 19:26:02 2009 +++ php-src/php.ini-distThu Feb 12 14:37:27 2009 @@ -290,11 +290,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL & ~E_NOTICE +;error_reporting = E_ALL | ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT +;error_reporting = E_ALL | ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -302,7 +302,7 @@ ; ; - Show all errors except for notices and coding standards warnings ; -error_reporting = E_ALL & ~E_NOTICE +error_reporting = E_ALL | ~E_NOTICE ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.28&r2=1.179.2.11.2.29&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.28 php-src/php.ini-recommended:1.179.2.11.2.29 --- php-src/php.ini-recommended:1.179.2.11.2.28 Sat Jan 31 19:26:02 2009 +++ php-src/php.ini-recommended Thu Feb 12 14:37:27 2009 @@ -339,11 +339,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL & ~E_NOTICE +;error_reporting = E_ALL | ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT +;error_reporting = E_ALL | ~E_NOTICE | E_STRICT ; ; - Show only errors ; -- 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) / php.ini-dist php.ini-recommended
kalle Thu Feb 12 14:36:58 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-dist php.ini-recommended Log: MFH: Fixed wrong usage of error_reporting directive http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.22.2.18&r2=1.231.2.10.2.22.2.19&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.22.2.18 php-src/php.ini-dist:1.231.2.10.2.22.2.19 --- php-src/php.ini-dist:1.231.2.10.2.22.2.18 Sat Jan 31 19:24:55 2009 +++ php-src/php.ini-distThu Feb 12 14:36:58 2009 @@ -301,11 +301,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL & ~E_NOTICE +;error_reporting = E_ALL | ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT +;error_reporting = E_ALL | ~E_NOTICE | E_STRICT ; ; - Show only errors ; @@ -313,7 +313,7 @@ ; ; - Show all errors except for notices and coding standards warnings ; -error_reporting = E_ALL & ~E_NOTICE +error_reporting = E_ALL | ~E_NOTICE ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23.2.19&r2=1.179.2.11.2.23.2.20&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23.2.19 php-src/php.ini-recommended:1.179.2.11.2.23.2.20 --- php-src/php.ini-recommended:1.179.2.11.2.23.2.19Sat Jan 31 19:24:55 2009 +++ php-src/php.ini-recommended Thu Feb 12 14:36:58 2009 @@ -351,11 +351,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL & ~E_NOTICE +;error_reporting = E_ALL | ~E_NOTICE ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT +;error_reporting = E_ALL | ~E_NOTICE | E_STRICT ; ; - Show only errors ; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
kalle Thu Feb 12 14:36:32 2009 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended Log: Fixed wrong usage of error_reporting directive http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.288&r2=1.289&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.288 php-src/php.ini-dist:1.289 --- php-src/php.ini-dist:1.288 Sat Jan 31 19:23:16 2009 +++ php-src/php.ini-distThu Feb 12 14:36:32 2009 @@ -222,7 +222,7 @@ ; error_reporting is a bit-field. Or each number up to get desired error ; reporting level -; E_ALL - All errors and warnings (doesn't include E_STRICT) +; E_ALL - All errors and warnings (includes E_STRICT) ; E_ERROR - fatal run-time errors ; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) @@ -232,7 +232,7 @@ ; intentional (e.g., using an uninitialized variable and ; relying on the fact it's automatically initialized to an ; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes +; E_STRICT - run-time notices, enable to have PHP suggest changes ; to your code which will ensure the best interoperability ; and forward compatibility of your code ; E_CORE_ERROR - fatal errors that occur during PHP's initial startup @@ -251,11 +251,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT +;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL & ~E_NOTICE +;error_reporting = E_ALL | ~E_NOTICE ; ; - Show only errors ; @@ -263,7 +263,7 @@ ; ; - Show all errors, except coding standards warnings ; -error_reporting = E_ALL & ~E_STRICT +error_reporting = E_ALL | ~E_STRICT ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.238&r2=1.239&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.238 php-src/php.ini-recommended:1.239 --- php-src/php.ini-recommended:1.238 Sat Jan 31 19:23:16 2009 +++ php-src/php.ini-recommended Thu Feb 12 14:36:32 2009 @@ -259,7 +259,7 @@ ; error_reporting is a bit-field. Or each number up to get desired error ; reporting level -; E_ALL - All errors and warnings (doesn't include E_STRICT) +; E_ALL - All errors and warnings (includes E_STRICT) ; E_ERROR - fatal run-time errors ; E_RECOVERABLE_ERROR - almost fatal run-time errors ; E_WARNING - run-time warnings (non-fatal errors) @@ -288,11 +288,11 @@ ; ; - Show all errors, except for notices and coding standards warnings ; -;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT +;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT ; ; - Show all errors, except for notices ; -;error_reporting = E_ALL & ~E_NOTICE +;error_reporting = E_ALL | ~E_NOTICE ; ; - Show only errors ; @@ -300,7 +300,7 @@ ; ; - Show all errors, except coding standards warnings ; -error_reporting = E_ALL & ~E_STRICT +error_reporting = E_ALL | ~E_STRICT ; Print out errors (as a part of the output). For production web sites, ; you're strongly encouraged to turn this feature off, and use error logging -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
