[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Feb 19 01:32:39 2009 UTC
Modified files:
/php-srcChangeLog
Log:
ChangeLog update
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3322r2=1.3323diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3322 php-src/ChangeLog:1.3323
--- php-src/ChangeLog:1.3322Wed Feb 18 01:32:35 2009
+++ php-src/ChangeLog Thu Feb 19 01:32:38 2009
@@ -1,3 +1,109 @@
+2009-02-18 Felipe Pena felipe...@gmail.com
+
+* (PHP_5_3)
+ ext/standard/tests/strings/bug47443.phpt:
+ - New test
+
+* ext/standard/tests/strings/bug47443.phpt
+ ext/standard/tests/strings/bug47443.phpt:
+
+ - New test
+
+* (PHP_5_3)
+ NEWS:
+ BFN
+
+* (PHP_5_3)
+ ext/standard/metaphone.c:
+ - MFH: Fixed bug #47443 (metaphone('scratch') returns wrong result)
+
+* ext/standard/metaphone.c:
+ - Fixed bug #47443 (metaphone('scratch') returns wrong result)
+
+2009-02-18 Ilia Alshanetsky i...@prohost.org
+
+* ext/sqlite3/sqlite3.c:
+ MFB: Removed unused var
+
+* (PHP_5_3)
+ ext/sqlite3/sqlite3.c:
+ Removed unused var
+
+2009-02-18 Robin Fernandes ro...@soal.org
+
+* main/output.c
+ tests/output/bug46903.phpt
+ tests/output/ob_start_basic_004.phpt:
+ Revert fix to bug #46903 as per
+ http://marc.info/?l=php-internalsm=123476465621346w=2 .
+
+2009-02-18 Johannes Schlüter johan...@schlueters.de
+
+* (PHP_5_3)
+ NEWS
+ ext/mysql/php_mysql.c
+ ext/mysql/tests/bug47438.phpt:
+ MFH: Fix #47438 mysql_fetch_field ignores zero offse
+
+* ext/mysql/php_mysql.c
+ ext/mysql/tests/bug47438.phpt
+ ext/mysql/tests/bug47438.phpt:
+ Fix #47438 mysql_fetch_field ignores zero offse
+
+2009-02-18 Dmitry Stogov dmi...@zend.com
+
+* ext/soap/tests/bugs/bug47049.phpt
+ ext/soap/tests/bugs/bug47049.phpt
+ ext/soap/tests/bugs/bug47049.phpt
+ ext/soap/tests/bugs/bug47049.wsdl
+ ext/soap/tests/bugs/bug47049.wsdl
+ ext/soap/tests/bugs/bug47049.wsdl:
+1.1.4;
+ file bug47049.phpt was initially added on branch PHP_5_2.
+
+* (PHP_5_2)
+ NEWS
+ ext/soap/soap.c
+ ext/soap/soap.c
+ ext/soap/soap.c
+ ext/soap/tests/bugs/bug47049.phpt
+ ext/soap/tests/bugs/bug47049.phpt
+ ext/soap/tests/bugs/bug47049.wsdl
+ ext/soap/tests/bugs/bug47049.wsdl:
+ Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault)
+
+2009-02-18 Scott MacVicar sc...@macvicar.net
+
+* (PHP_5_3)
+ NEWS:
+ BFN
+
+* ext/sqlite3/libsqlite/sqlite3.c
+ ext/sqlite3/libsqlite/sqlite3.h
+ ext/sqlite3/libsqlite/sqlite3ext.h:
+ Update bundled SQLite to 3.6.11
+
+2009-02-18 Dmitry Stogov dmi...@zend.com
+
+* ZendEngine2/tests/bug47343.phpt
+ ZendEngine2/tests/bug47343.phpt:
+
+ file bug47343.phpt was initially added on branch PHP_5_3.
+
+* (PHP_5_3)
+ NEWS
+ ZendEngine2/zend_gc.c
+ ZendEngine2/zend_gc.c
+ ZendEngine2/tests/bug47343.phpt:
+ Fixed bug #47343 (gc_collect_cycles causes a segfault when called within
a
+ destructor in one case)
+
+* ZendEngine2/zend.c
+ ZendEngine2/zend.c
+ ZendEngine2/zend.h
+ ZendEngine2/zend.h:
+ Fixed zend_print_zval_r_ex() to use the write callback function
+
2009-02-17 Zoe Slattery zoe.slatt...@googlemail.com
* ZendEngine2/tests/bug46701.phpt
@@ -30527,7 +30633,7 @@
* sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c:
- - Added missing $Id: ChangeLog,v 1.3322 2009/02/18 01:32:35 changelog
Exp $ tags and nuked c++ comments
+ - Added missing $Id: ChangeLog,v 1.3323 2009/02/19 01:32:38 changelog
Exp $ tags and nuked c++ comments
* (PHP_5_3)
ext/intl/locale/locale.c
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Feb 19 01:32:43 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1447r2=1.1448diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1447 ZendEngine2/ChangeLog:1.1448 --- ZendEngine2/ChangeLog:1.1447Wed Feb 18 01:32:40 2009 +++ ZendEngine2/ChangeLog Thu Feb 19 01:32:43 2009 @@ -1,3 +1,22 @@ +2009-02-18 Dmitry Stogov dmi...@zend.com + +* zend_gc.c + zend_gc.c + tests/bug47343.phpt: + Fixed bug #47343 (gc_collect_cycles causes a segfault when called within a + destructor in one case) + +* tests/bug47343.phpt + tests/bug47343.phpt: + + file bug47343.phpt was initially added on branch PHP_5_3. + +* zend.c + zend.c + zend.h + zend.h: + Fixed zend_print_zval_r_ex() to use the write callback function + 2009-02-17 Zoe Slattery zoe.slatt...@googlemail.com * tests/bug46701.phpt @@ -27869,7 +27888,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1447 2009/02/18 01:32:40 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1448 2009/02/19 01:32:43 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -29593,7 +29612,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1447 2009/02/18 01:32:40 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1448 2009/02/19 01:32:43 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacWed Feb 18 12:55:34 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.500r2=1.2027.2.547.2.965.2.501diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.500 php-src/NEWS:1.2027.2.547.2.965.2.501 --- php-src/NEWS:1.2027.2.547.2.965.2.500 Wed Feb 18 12:02:52 2009 +++ php-src/NEWSWed Feb 18 12:55:34 2009 @@ -1,6 +1,8 @@ PHPNEWS ||| -?? ??? 2009, PHP 5.3.0 Beta 2 +?? ??? 2009, PHP 5.3.0 Beta 2 +- Upgraded bundled sqlite to version 3.6.11. (Scott) + - Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly). (Felipe) - Fixed bug #47390 (odbc_fetch_into - BC in php 5.3.0). (Felipe) - Fixed bug #47343 (gc_collect_cycles causes a segfault when called within a -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug47049.phpt bug47049.wsdl
dmitry Wed Feb 18 13:25:32 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug47049.phpt bug47049.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1424r2=1.2027.2.547.2.1425diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1424 php-src/NEWS:1.2027.2.547.2.1425
--- php-src/NEWS:1.2027.2.547.2.1424Tue Feb 17 17:09:24 2009
+++ php-src/NEWSWed Feb 18 13:25:31 2009
@@ -5,6 +5,8 @@
(Matt)
- Fixed bug #47399 (mb_check_encoding() returns true for some illegal SJIS
characters). (for-bugs at hnw dot jp, Moriyoshi)
+- Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault).
+ (Dmitry)
- Fixed bug #45940 (MySQLI OO does not populate connect_error property on
failed connect). (Johannes)
- Fixed bug #45923 (mb_st[r]ripos() offset not handled correctly). (Moriyoshi)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.43r2=1.156.2.28.2.44diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.43
php-src/ext/soap/soap.c:1.156.2.28.2.44
--- php-src/ext/soap/soap.c:1.156.2.28.2.43 Mon Feb 2 10:00:32 2009
+++ php-src/ext/soap/soap.c Wed Feb 18 13:25:32 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.43 2009/02/02 10:00:32 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.44 2009/02/18 13:25:32 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4187,7 +4187,17 @@
/*style = SOAP_RPC;*/
if (style == SOAP_RPC) {
ns = encode_add_ns(body, uri);
- method = xmlNewChild(body, ns, BAD_CAST(function_name),
NULL);
+ if (function_name) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function_name), NULL);
+ } else if (function function-requestName) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function-requestName), NULL);
+ } else if (function function-functionName) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function-functionName), NULL);
+ } else {
+ method = body;
+ }
+ } else {
+ method = body;
}
if (zend_hash_find(Z_OBJPROP_P(this_ptr), use, sizeof(use),
(void **)zuse) == SUCCESS
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug47049.phpt
+++ php-src/ext/soap/tests/bugs/bug47049.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug47049.wsdl
+++ php-src/ext/soap/tests/bugs/bug47049.wsdl
--
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/soap soap.c /ext/soap/tests/bugs bug47049.phpt bug47049.wsdl
dmitry Wed Feb 18 13:25:49 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/soap/tests/bugsbug47049.phpt bug47049.wsdl
Modified files:
/php-src/ext/soap soap.c
Log:
Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.31r2=1.156.2.28.2.30.2.32diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.31
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.32
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.31Mon Feb 2 10:00:11 2009
+++ php-src/ext/soap/soap.c Wed Feb 18 13:25:48 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.30.2.31 2009/02/02 10:00:11 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.32 2009/02/18 13:25:48 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4377,7 +4377,17 @@
/*style = SOAP_RPC;*/
if (style == SOAP_RPC) {
ns = encode_add_ns(body, uri);
- method = xmlNewChild(body, ns, BAD_CAST(function_name),
NULL);
+ if (function_name) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function_name), NULL);
+ } else if (function function-requestName) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function-requestName), NULL);
+ } else if (function function-functionName) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function-functionName), NULL);
+ } else {
+ method = body;
+ }
+ } else {
+ method = body;
}
if (zend_hash_find(Z_OBJPROP_P(this_ptr), use, sizeof(use),
(void **)zuse) == SUCCESS
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug47049.phpt
+++ php-src/ext/soap/tests/bugs/bug47049.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug47049.wsdl
+++ php-src/ext/soap/tests/bugs/bug47049.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/tests/bugs bug47049.phpt bug47049.wsdl
dmitry Wed Feb 18 13:25:59 2009 UTC
Modified files:
/php-src/ext/soap soap.c
/php-src/ext/soap/tests/bugsbug47049.phpt bug47049.wsdl
Log:
Fixed bug #47049 (SoapClient::__soapCall causes a segmentation fault)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.259r2=1.260diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.259 php-src/ext/soap/soap.c:1.260
--- php-src/ext/soap/soap.c:1.259 Mon Feb 2 09:59:49 2009
+++ php-src/ext/soap/soap.c Wed Feb 18 13:25:59 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: soap.c,v 1.259 2009/02/02 09:59:49 felipe Exp $ */
+/* $Id: soap.c,v 1.260 2009/02/18 13:25:59 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4821,7 +4821,17 @@
/*style = SOAP_RPC;*/
if (style == SOAP_RPC) {
ns = encode_add_ns(body, uri);
- method = xmlNewChild(body, ns, BAD_CAST(function_name),
NULL);
+ if (function_name) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function_name), NULL);
+ } else if (function function-requestName) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function-requestName), NULL);
+ } else if (function function-functionName) {
+ method = xmlNewChild(body, ns,
BAD_CAST(function-functionName), NULL);
+ } else {
+ method = body;
+ }
+ } else {
+ method = body;
}
if (client-use == SOAP_LITERAL) {
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug47049.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug47049.phpt:1.2
--- /dev/null Wed Feb 18 13:25:59 2009
+++ php-src/ext/soap/tests/bugs/bug47049.phpt Wed Feb 18 13:25:59 2009
@@ -0,0 +1,19 @@
+--TEST--
+Bug #47049 (SoapClient::__soapCall causes a segmentation fault)
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+?php
+$client = new SoapClient(dirname(__FILE__) . '/bug47049.wsdl',
+ array('trace' = 1 , 'exceptions' = 0));
+$host = array('uuid' = 'foo');
+$software_list = array(array('name' = 'package', 'version' = '1.2.3',
'state' = 'installed'));
+$updates = array();
+$report_id = $client-__soapCall('reportSoftwareStatus',array($host,
$software_list, $updates));
+echo $client-__getLastRequest();
+?
+--EXPECT--
+?xml version=1.0 encoding=UTF-8?
+SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://www.example.org/reporter/;
xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:reportSoftwareStatushost
xsi:type=ns1:hostuuid
xsi:type=xsd:stringfoo/uuid/hostsoftware_list
xsi:type=ns1:software_listsoftware xsi:type=ns1:softwarename
xsi:type=xsd:stringpackage/nameversion
xsi:type=xsd:string1.2.3/versionstate
xsi:type=xsd:stringinstalled/state/software/software_listupdates
xsi:type=ns1:updates//ns1:reportSoftwareStatus/SOAP-ENV:Body/SOAP-ENV:Envelope
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug47049.wsdl?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug47049.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/bug47049.wsdl:1.2
--- /dev/null Wed Feb 18 13:25:59 2009
+++ php-src/ext/soap/tests/bugs/bug47049.wsdl Wed Feb 18 13:25:59 2009
@@ -0,0 +1,80 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+wsdl:definitions xmlns:http=http://schemas.xmlsoap.org/wsdl/http/;
xmlns:mime=http://schemas.xmlsoap.org/wsdl/mime/;
xmlns:tns=http://www.example.org/reporter/;
xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/;
xmlns:xsd=http://www.w3.org/2001/XMLSchema; name=reporter
targetNamespace=http://www.example.org/reporter/;
xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/;
+wsdl:typesxsd:schema xmlns:xsd=http://www.w3.org/2001/XMLSchema;
targetNamespace=http://www.example.org/reporter/;
+xsd:complexType name=host
+xsd:sequence
+xsd:element name=uuid
type=xsd:string/xsd:element
+/xsd:sequence
+/xsd:complexType
+xsd:complexType name=software_list
+xsd:sequence
+xsd:element name=software type=tns:software
+maxOccurs=unbounded minOccurs=1
+/xsd:element
+/xsd:sequence
+/xsd:complexType
+xsd:complexType
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysql/tests bug47438.phpt
johannesWed Feb 18 16:33:28 2009 UTC
Added files:
/php-src/ext/mysql/testsbug47438.phpt
Modified files:
/php-src/ext/mysql php_mysql.c
Log:
Fix #47438 mysql_fetch_field ignores zero offse
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.272r2=1.273diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.272 php-src/ext/mysql/php_mysql.c:1.273
--- php-src/ext/mysql/php_mysql.c:1.272 Wed Dec 31 11:12:32 2008
+++ php-src/ext/mysql/php_mysql.c Wed Feb 18 16:33:28 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.272 2008/12/31 11:12:32 sebastian Exp $ */
+/* $Id: php_mysql.c,v 1.273 2009/02/18 16:33:28 johannes Exp $ */
/* TODO:
*
@@ -2379,7 +2379,7 @@
ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, MySQL
result, le_result);
- if (field) {
+ if (ZEND_NUM_ARGS() 1) {
if (field0 || field=(int)mysql_num_fields(mysql_result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Bad field
offset);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/bug47438.phpt?view=markuprev=1.1
Index: php-src/ext/mysql/tests/bug47438.phpt
+++ php-src/ext/mysql/tests/bug47438.phpt
--TEST--
Bug #47438 mysql_fetch_field ignores zero offset
--SKIPIF--
?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?
--FILE--
?php
require_once('connect.inc');
if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
printf([001] Cannot connect to the server using host=%s, user=%s,
passwd=***, dbname=%s, port=%s, socket=%s\n,
$host, $user, $db, $port, $socket);
mysql_connect(localhost, root, );
mysql_select_db(test);
mysql_query(DROP TABLE IF EXISTS test_47438);
mysql_query(CREATE TABLE test_47438 (a INT, b INT, c INT));
mysql_query(INSERT INTO test_47438 VALUES (10, 11, 12), (20, 21, 22));
$result = mysql_query(SELECT * FROM test_47438);
mysql_field_seek($result, 1);
$i = 0;
while($imysql_num_fields($result))
{
$meta=mysql_fetch_field($result,$i);
echo $i . . . $meta-name . \n;
$i++;
}
mysql_query(DROP TABLE IF EXISTS test_47438);
?
--EXPECT--
0.a
1.b
2.c
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/mysql php_mysql.c /ext/mysql/tests bug47438.phpt
johannesWed Feb 18 16:34:48 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/mysql/testsbug47438.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mysql php_mysql.c
Log:
MFH: Fix #47438 mysql_fetch_field ignores zero offse
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.501r2=1.2027.2.547.2.965.2.502diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.501
php-src/NEWS:1.2027.2.547.2.965.2.502
--- php-src/NEWS:1.2027.2.547.2.965.2.501 Wed Feb 18 12:55:34 2009
+++ php-src/NEWSWed Feb 18 16:34:47 2009
@@ -3,6 +3,7 @@
?? ??? 2009, PHP 5.3.0 Beta 2
- Upgraded bundled sqlite to version 3.6.11. (Scott)
+- Fixed bug #47438 (mysql_fetch_field ignores zero offset). (Johannes)
- Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly). (Felipe)
- Fixed bug #47390 (odbc_fetch_into - BC in php 5.3.0). (Felipe)
- Fixed bug #47343 (gc_collect_cycles causes a segfault when called within a
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.34r2=1.213.2.6.2.16.2.35diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.34
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.35
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.34 Wed Dec 31 11:15:38 2008
+++ php-src/ext/mysql/php_mysql.c Wed Feb 18 16:34:47 2009
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.34 2008/12/31 11:15:38 sebastian Exp $
*/
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.35 2009/02/18 16:34:47 johannes Exp $ */
/* TODO:
*
@@ -2318,7 +2318,7 @@
ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, MySQL
result, le_result);
- if (field) {
+ if (ZEND_NUM_ARGS() 1) {
if (field0 || field=(int)mysql_num_fields(mysql_result)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Bad field
offset);
RETURN_FALSE;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/bug47438.phpt?view=markuprev=1.1
Index: php-src/ext/mysql/tests/bug47438.phpt
+++ php-src/ext/mysql/tests/bug47438.phpt
--TEST--
Bug #47438 mysql_fetch_field ignores zero offset
--SKIPIF--
?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?
--FILE--
?php
require_once('connect.inc');
if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
printf([001] Cannot connect to the server using host=%s, user=%s,
passwd=***, dbname=%s, port=%s, socket=%s\n,
$host, $user, $db, $port, $socket);
mysql_connect(localhost, root, );
mysql_select_db(test);
mysql_query(DROP TABLE IF EXISTS test_47438);
mysql_query(CREATE TABLE test_47438 (a INT, b INT, c INT));
mysql_query(INSERT INTO test_47438 VALUES (10, 11, 12), (20, 21, 22));
$result = mysql_query(SELECT * FROM test_47438);
mysql_field_seek($result, 1);
$i = 0;
while($imysql_num_fields($result))
{
$meta=mysql_fetch_field($result,$i);
echo $i . . . $meta-name . \n;
$i++;
}
mysql_query(DROP TABLE IF EXISTS test_47438);
?
--EXPECT--
0.a
1.b
2.c
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main output.c
robinf Wed Feb 18 16:42:52 2009 UTC
Modified files:
/php-src/main output.c
Log:
Revert fix to bug #46903 as per
http://marc.info/?l=php-internalsm=123476465621346w=2 .
http://cvs.php.net/viewvc.cgi/php-src/main/output.c?r1=1.216r2=1.217diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.216 php-src/main/output.c:1.217
--- php-src/main/output.c:1.216 Wed Dec 31 11:12:38 2008
+++ php-src/main/output.c Wed Feb 18 16:42:52 2009
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: output.c,v 1.216 2008/12/31 11:12:38 sebastian Exp $ */
+/* $Id: output.c,v 1.217 2009/02/18 16:42:52 robinf Exp $ */
#ifndef PHP_OUTPUT_DEBUG
# define PHP_OUTPUT_DEBUG 0
@@ -1342,8 +1342,6 @@
}
if (chunk_size 0) {
chunk_size = 0;
- } else if (chunk_size == 1) {
- chunk_size = 4096;
}
if (SUCCESS != php_output_start_user(output_handler, chunk_size, flags
TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/output bug46903.phpt ob_start_basic_004.phpt
robinf Wed Feb 18 16:42:56 2009 UTC
Modified files:
/php-src/tests/output bug46903.phpt ob_start_basic_004.phpt
Log:
Revert fix to bug #46903 as per
http://marc.info/?l=php-internalsm=123476465621346w=2 .
http://cvs.php.net/viewvc.cgi/php-src/tests/output/bug46903.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/output/bug46903.phpt
diff -u php-src/tests/output/bug46903.phpt:1.1
php-src/tests/output/bug46903.phpt:1.2
--- php-src/tests/output/bug46903.phpt:1.1 Sun Dec 28 19:50:58 2008
+++ php-src/tests/output/bug46903.phpt Wed Feb 18 16:42:56 2009
@@ -1,5 +1,5 @@
--TEST--
-Bug #46903 (ob_start(): Special $chunk_size value of 1 is not honoured in HEAD)
+Bug #46903: ob_start(): In HEAD, $chunk_size value of 1 should not have any
special behaviour (Updated as per:
http://marc.info/?l=php-internalsm=123476465621346w=2)
--FILE--
?php
function flushCounter($input) {
@@ -20,5 +20,8 @@
echo 2;
?
--EXPECTF--
-[1] int(4096)
-12
\ No newline at end of file
+[1] int(1)
+
+[2] 1
+[3] 2
+[4]
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/tests/output/ob_start_basic_004.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/tests/output/ob_start_basic_004.phpt
diff -u php-src/tests/output/ob_start_basic_004.phpt:1.3
php-src/tests/output/ob_start_basic_004.phpt:1.4
--- php-src/tests/output/ob_start_basic_004.phpt:1.3Sun Dec 28 19:50:58 2008
+++ php-src/tests/output/ob_start_basic_004.phptWed Feb 18 16:42:56 2009
@@ -1,12 +1,12 @@
--TEST--
-ob_start() chunk_size: confirm buffer is flushed after any output call that
causes its length to equal or exceed chunk_size.
+ob_start() chunk_size: confirm buffer is flushed after any output call that
causes its length to equal or exceed chunk_size.
--FILE--
?php
/*
* proto bool ob_start([ string|array user_function [, int chunk_size [, bool
erase]]])
* Function is implemented in main/output.c
*/
-
+// In HEAD, $chunk_size value of 1 should not have any special behaviour
(http://marc.info/?l=php-internalsm=123476465621346w=2).
function callback($string) {
global $callback_invocations;
$callback_invocations++;
@@ -40,7 +40,15 @@
f[call:1; len:8]12345678
( chunk_size: 1, output append size: 1 )
-f[call:1; len:8]12345678
+f[call:1; len:1]1
+f[call:2; len:1]2
+f[call:3; len:1]3
+f[call:4; len:1]4
+f[call:5; len:1]5
+f[call:6; len:1]6
+f[call:7; len:1]7
+f[call:8; len:1]8
+f[call:9; len:0]
( chunk_size: 2, output append size: 1 )
f[call:1; len:2]12
@@ -85,7 +93,9 @@
f[call:1; len:8]12345678
( chunk_size: 1, output append size: 4 )
-f[call:1; len:8]12345678
+f[call:1; len:4]1234
+f[call:2; len:4]5678
+f[call:3; len:0]
( chunk_size: 2, output append size: 4 )
f[call:1; len:4]1234
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard array.c
Moriyoshi Koizumi wrote: I got a bug report, then I fixed it. That's just an normal procedure for bugfixing. Isn't it? Am I supposed to have a written permission from you whenever I fix a part you did ever touch? And the old behavior is strange, but not *broken*. It just doesn't work for your case. I wasn't looking for you to ask permission, but simply to discuss this before fixing something that was already fixed for the release. I mean, did you wonder at all why I set the default to be SORT_REGULAR? Would have been nice to talk about it, that's all. -Andrei -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 sqlite3.c
iliaa Wed Feb 18 20:07:40 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3sqlite3.c
Log:
Removed unused var
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.32r2=1.1.2.33diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.32
php-src/ext/sqlite3/sqlite3.c:1.1.2.33
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.32 Tue Feb 10 00:24:33 2009
+++ php-src/ext/sqlite3/sqlite3.c Wed Feb 18 20:07:40 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.32 2009/02/10 00:24:33 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.33 2009/02/18 20:07:40 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -902,7 +902,7 @@
static size_t php_sqlite3_stream_write(php_stream *stream, const char *buf,
size_t count TSRMLS_DC)
{
- php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+/* php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract; */
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 sqlite3.c
iliaa Wed Feb 18 20:07:55 2009 UTC
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
MFB: Removed unused var
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.35 php-src/ext/sqlite3/sqlite3.c:1.36
--- php-src/ext/sqlite3/sqlite3.c:1.35 Tue Feb 10 00:44:09 2009
+++ php-src/ext/sqlite3/sqlite3.c Wed Feb 18 20:07:55 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.35 2009/02/10 00:44:09 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.36 2009/02/18 20:07:55 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -930,7 +930,7 @@
static size_t php_sqlite3_stream_write(php_stream *stream, const char *buf,
size_t count TSRMLS_DC)
{
- php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+/* php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract; */
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard metaphone.c
felipe Wed Feb 18 22:33:22 2009 UTC
Modified files:
/php-src/ext/standard metaphone.c
Log:
- Fixed bug #47443 (metaphone('scratch') returns wrong result)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.39r2=1.40diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.39
php-src/ext/standard/metaphone.c:1.40
--- php-src/ext/standard/metaphone.c:1.39 Wed Dec 31 11:12:37 2008
+++ php-src/ext/standard/metaphone.cWed Feb 18 22:33:22 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: metaphone.c,v 1.39 2008/12/31 11:12:37 sebastian Exp $ */
+/* $Id: metaphone.c,v 1.40 2009/02/18 22:33:22 felipe Exp $ */
/*
Based on CPANs Text-Metaphone-1.96 by Michael G Schwern
schw...@pobox.com
@@ -420,7 +420,7 @@
} else if (Next_Letter == 'H') {
Phonize(TH);
skip_letter++;
- } else {
+ } else if (!(Next_Letter == 'C' After_Next_Letter ==
'H')) {
Phonize('T');
}
break;
--
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 metaphone.c
felipe Wed Feb 18 22:34:06 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard metaphone.c
Log:
- MFH: Fixed bug #47443 (metaphone('scratch') returns wrong result)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.28.2.1.2.4.2.4r2=1.28.2.1.2.4.2.5diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.4
php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.5
--- php-src/ext/standard/metaphone.c:1.28.2.1.2.4.2.4 Wed Dec 31 11:15:45 2008
+++ php-src/ext/standard/metaphone.cWed Feb 18 22:34:06 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: metaphone.c,v 1.28.2.1.2.4.2.4 2008/12/31 11:15:45 sebastian Exp $ */
+/* $Id: metaphone.c,v 1.28.2.1.2.4.2.5 2009/02/18 22:34:06 felipe Exp $ */
/*
Based on CPANs Text-Metaphone-1.96 by Michael G Schwern
schw...@pobox.com
@@ -421,7 +421,7 @@
} else if (Next_Letter == 'H') {
Phonize(TH);
skip_letter++;
- } else {
+ } else if (!(Next_Letter == 'C' After_Next_Letter ==
'H')) {
Phonize('T');
}
break;
--
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
felipe Wed Feb 18 22:35:33 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
Log:
BFN
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.502r2=1.2027.2.547.2.965.2.503diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.502
php-src/NEWS:1.2027.2.547.2.965.2.503
--- php-src/NEWS:1.2027.2.547.2.965.2.502 Wed Feb 18 16:34:47 2009
+++ php-src/NEWSWed Feb 18 22:35:32 2009
@@ -3,6 +3,7 @@
?? ??? 2009, PHP 5.3.0 Beta 2
- Upgraded bundled sqlite to version 3.6.11. (Scott)
+- Fixed Bug #47443 (metaphone('scratch') returns wrong result). (Felipe)
- Fixed bug #47438 (mysql_fetch_field ignores zero offset). (Johannes)
- Fixed bug #47398 (PDO_Firebird doesn't implements quoter correctly). (Felipe)
- Fixed bug #47390 (odbc_fetch_into - BC in php 5.3.0). (Felipe)
--
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/strings bug47443.phpt
felipe Wed Feb 18 22:53:44 2009 UTC
Added files:
/php-src/ext/standard/tests/strings bug47443.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug47443.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug47443.phpt
+++ php-src/ext/standard/tests/strings/bug47443.phpt
--TEST--
Bug #47443 (metaphone('scratch') returns wrong result)
--FILE--
?php
var_dump(metaphone(scratch));
var_dump(metaphone(scrath));
var_dump(metaphone(scratc));
?
--EXPECTF--
%string|unicode%(4) SKRX
%string|unicode%(4) SKR0
%string|unicode%(5) SKRTK
--
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/strings bug47443.phpt
felipe Wed Feb 18 22:53:56 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/strings bug47443.phpt
Log:
- New test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug47443.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug47443.phpt
+++ php-src/ext/standard/tests/strings/bug47443.phpt
--TEST--
Bug #47443 (metaphone('scratch') returns wrong result)
--FILE--
?php
var_dump(metaphone(scratch));
var_dump(metaphone(scrath));
var_dump(metaphone(scratc));
?
--EXPECTF--
%string|unicode%(4) SKRX
%string|unicode%(4) SKR0
%string|unicode%(5) SKRTK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
