[PHP-CVS] cvs: php-src /ext/pdo_oci oci_statement.c /ext/pdo_oci/tests bug44301.phpt
pajoye Tue Jul 22 06:48:09 2008 UTC
Added files:
/php-src/ext/pdo_oci/tests bug44301.phpt
Modified files:
/php-src/ext/pdo_ocioci_statement.c
Log:
- Segfault when an exception is thrown on persistent connections
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_statement.c?r1=1.26r2=1.27diff_format=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.26
php-src/ext/pdo_oci/oci_statement.c:1.27
--- php-src/ext/pdo_oci/oci_statement.c:1.26Mon Jul 21 17:17:58 2008
+++ php-src/ext/pdo_oci/oci_statement.c Tue Jul 22 06:48:09 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: oci_statement.c,v 1.26 2008/07/21 17:17:58 pajoye Exp $ */
+/* $Id: oci_statement.c,v 1.27 2008/07/22 06:48:09 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -86,7 +86,7 @@
}
if (S-einfo.errmsg) {
- efree(S-einfo.errmsg);
+ pefree(S-einfo.errmsg, stmt-dbh-is_persistent);
S-einfo.errmsg = NULL;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/bug44301.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_oci/tests/bug44301.phpt
+++ php-src/ext/pdo_oci/tests/bug44301.phpt
--TEST--
PDO OCI Bug #44301 (Segfault when an exception is thrown on persistent
connections)
--SKIPIF--
?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not
loaded');
require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc';
PDOTest::skip();
?
--FILE--
?php
putenv(PDO_OCI_TEST_ATTR= . serialize(array(PDO::ATTR_PERSISTENT = true)));
require 'ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
$db-setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
try {
$stmt = $db-prepare('SELECT * FROM no_table');
$stmt-execute();
} catch (PDOException $e) {
print $e-getMessage();
}
$db = null;
--EXPECTF--
SQLSTATE[HY000]: General error: 942 OCIStmtExecute: ORA-00942: table or view
does not exist
(%s/ext/pdo_oci/oci_statement.c:%d)
--
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/pdo_oci oci_statement.c /ext/pdo_oci/tests bug44301.phpt
pajoye Tue Jul 22 06:51:00 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pdo_oci/tests bug44301.phpt
Modified files:
/php-srcNEWS
/php-src/ext/pdo_ocioci_statement.c
Log:
- MFH: Segfault when an exception is thrown on persistent connections
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.210r2=1.2027.2.547.2.965.2.211diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.210
php-src/NEWS:1.2027.2.547.2.965.2.211
--- php-src/NEWS:1.2027.2.547.2.965.2.210 Mon Jul 21 17:35:50 2008
+++ php-src/NEWSTue Jul 22 06:50:59 2008
@@ -232,6 +232,8 @@
(Andrey)
- Fixed bug #44336 (Improve pcre UTF-8 string matching performance).
(frode at coretrek dot com, Nuno)
+- Fixed bug #44301 (Segfault when an exception is thrown on persistent
connections).
+ (Martin Jansen)
- Fixed bug #44257 (timelib_tz_lookup_table must use float for gmtoffset).
(Derick, iuri dot fiedoruk at hp dot com).
- Fixed bug #44214 (Crash using preg_replace_callback() and global variable).
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/oci_statement.c?r1=1.16.2.10.2.7.2.2r2=1.16.2.10.2.7.2.3diff_format=u
Index: php-src/ext/pdo_oci/oci_statement.c
diff -u php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.7.2.2
php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.7.2.3
--- php-src/ext/pdo_oci/oci_statement.c:1.16.2.10.2.7.2.2 Mon Jul 21
17:35:50 2008
+++ php-src/ext/pdo_oci/oci_statement.c Tue Jul 22 06:50:59 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: oci_statement.c,v 1.16.2.10.2.7.2.2 2008/07/21 17:35:50 pajoye Exp $ */
+/* $Id: oci_statement.c,v 1.16.2.10.2.7.2.3 2008/07/22 06:50:59 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -87,7 +87,7 @@
}
if (S-einfo.errmsg) {
- efree(S-einfo.errmsg);
+ pefree(S-einfo.errmsg, stmt-dbh-is_persistent);
S-einfo.errmsg = NULL;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/tests/bug44301.phpt?view=markuprev=1.1
Index: php-src/ext/pdo_oci/tests/bug44301.phpt
+++ php-src/ext/pdo_oci/tests/bug44301.phpt
--TEST--
PDO OCI Bug #44301 (Segfault when an exception is thrown on persistent
connections)
--SKIPIF--
?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not
loaded');
require dirname(__FILE__).'/../../pdo/tests/pdo_test.inc';
PDOTest::skip();
?
--FILE--
?php
putenv(PDO_OCI_TEST_ATTR= . serialize(array(PDO::ATTR_PERSISTENT = true)));
require 'ext/pdo/tests/pdo_test.inc';
$db = PDOTest::test_factory('ext/pdo_oci/tests/common.phpt');
$db-setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
try {
$stmt = $db-prepare('SELECT * FROM no_table');
$stmt-execute();
} catch (PDOException $e) {
print $e-getMessage();
}
$db = null;
--EXPECTF--
SQLSTATE[HY000]: General error: 942 OCIStmtExecute: ORA-00942: table or view
does not exist
(%s/ext/pdo_oci/oci_statement.c:%d)
--
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/phar phar.c phar_internal.h phar_object.c /ext/phar/tests frontcontroller11.phpt /ext/phar/tests/cache_list frontcontroller11.phpt /ext/phar/tests/cache_list/fi
dmitry Tue Jul 22 07:03:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.c phar_internal.h phar_object.c
/php-src/ext/phar/tests frontcontroller11.phpt
/php-src/ext/phar/tests/cache_list frontcontroller11.phpt
/php-src/ext/phar/tests/cache_list/filesfrontcontroller6.phar
frontcontroller7.phar
/php-src/ext/phar/tests/files frontcontroller5.phar
frontcontroller6.phar
frontcontroller6.phar.inc
frontcontroller7.phar
frontcontroller7.phar.inc
/php-src/ext/phar/tests/tar frontcontroller11.phar.phpt
/php-src/ext/phar/tests/tar/files frontcontroller6.phar.inc
frontcontroller6.phar.tar
frontcontroller7.phar.inc
frontcontroller7.phar.tar
/php-src/ext/phar/tests/zip frontcontroller11.phar.phpt
/php-src/ext/phar/tests/zip/files frontcontroller6.phar.inc
frontcontroller6.phar.zip
frontcontroller7.phar.inc
frontcontroller7.phar.zip
Log:
Improved webPhar speed (frontcontroller11.phar.phpt is disabled, should be
removed)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.35r2=1.370.2.36diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.35 php-src/ext/phar/phar.c:1.370.2.36
--- php-src/ext/phar/phar.c:1.370.2.35 Sun Jul 20 14:42:34 2008
+++ php-src/ext/phar/phar.c Tue Jul 22 07:03:00 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar.c,v 1.370.2.35 2008/07/20 14:42:34 dmitry Exp $ */
+/* $Id: phar.c,v 1.370.2.36 2008/07/22 07:03:00 dmitry Exp $ */
#define PHAR_MAIN 1
#include phar_internal.h
@@ -3283,6 +3283,8 @@
PHP_MINIT_FUNCTION(phar) /* {{{ */
{
+ phar_mime_type mime;
+
ZEND_INIT_MODULE_GLOBALS(phar, php_phar_init_globals_module, NULL);
REGISTER_INI_ENTRIES();
@@ -3301,6 +3303,55 @@
phar_intercept_functions_init(TSRMLS_C);
+ zend_hash_init(PHAR_G(mime_types), 0, NULL, NULL, 1);
+
+#define PHAR_SET_MIME(mimetype, ret, fileext) \
+ mime.mime = mimetype; \
+ mime.len = sizeof((mimetype))+1; \
+ mime.type = ret; \
+ zend_hash_add(PHAR_G(mime_types), fileext, sizeof(fileext)-1,
(void *)mime, sizeof(phar_mime_type), NULL); \
+
+ PHAR_SET_MIME(text/html, PHAR_MIME_PHPS, phps)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, c)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, cc)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, cpp)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, c++)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, dtd)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, h)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, log)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, rng)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, txt)
+ PHAR_SET_MIME(text/plain, PHAR_MIME_OTHER, xsd)
+ PHAR_SET_MIME(, PHAR_MIME_PHP, php)
+ PHAR_SET_MIME(, PHAR_MIME_PHP, inc)
+ PHAR_SET_MIME(video/avi, PHAR_MIME_OTHER, avi)
+ PHAR_SET_MIME(image/bmp, PHAR_MIME_OTHER, bmp)
+ PHAR_SET_MIME(text/css, PHAR_MIME_OTHER, css)
+ PHAR_SET_MIME(image/gif, PHAR_MIME_OTHER, gif)
+ PHAR_SET_MIME(text/html, PHAR_MIME_OTHER, htm)
+ PHAR_SET_MIME(text/html, PHAR_MIME_OTHER, html)
+ PHAR_SET_MIME(text/html, PHAR_MIME_OTHER, htmls)
+ PHAR_SET_MIME(image/x-ico, PHAR_MIME_OTHER, ico)
+ PHAR_SET_MIME(image/jpeg, PHAR_MIME_OTHER, jpe)
+ PHAR_SET_MIME(image/jpeg, PHAR_MIME_OTHER, jpg)
+ PHAR_SET_MIME(image/jpeg, PHAR_MIME_OTHER, jpeg)
+ PHAR_SET_MIME(application/x-javascript, PHAR_MIME_OTHER, js)
+ PHAR_SET_MIME(audio/midi, PHAR_MIME_OTHER, midi)
+ PHAR_SET_MIME(audio/midi, PHAR_MIME_OTHER, mid)
+ PHAR_SET_MIME(audio/mod, PHAR_MIME_OTHER, mod)
+ PHAR_SET_MIME(movie/quicktime, PHAR_MIME_OTHER, mov)
+ PHAR_SET_MIME(audio/mp3, PHAR_MIME_OTHER, mp3)
+ PHAR_SET_MIME(video/mpeg, PHAR_MIME_OTHER, mpg)
+ PHAR_SET_MIME(video/mpeg, PHAR_MIME_OTHER, mpeg)
+ PHAR_SET_MIME(application/pdf, PHAR_MIME_OTHER, pdf)
+ PHAR_SET_MIME(image/png, PHAR_MIME_OTHER, png)
+ PHAR_SET_MIME(application/shockwave-flash, PHAR_MIME_OTHER, swf)
+ PHAR_SET_MIME(image/tiff, PHAR_MIME_OTHER, tif)
+ PHAR_SET_MIME(image/tiff, PHAR_MIME_OTHER, tiff)
+ PHAR_SET_MIME(audio/wav, PHAR_MIME_OTHER, wav)
+ PHAR_SET_MIME(image/xbm, PHAR_MIME_OTHER, xbm)
+ PHAR_SET_MIME(text/xml, PHAR_MIME_OTHER, xml)
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap/tests/bugs bug39815.phpt
dmitry Tue Jul 22 07:09:59 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap/tests/bugsbug39815.phpt
Log:
Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug39815.phpt?r1=1.1.2.4.2.2r2=1.1.2.4.2.3diff_format=u
Index: php-src/ext/soap/tests/bugs/bug39815.phpt
diff -u php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.4.2.2
php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.4.2.3
--- php-src/ext/soap/tests/bugs/bug39815.phpt:1.1.2.4.2.2 Sat May 24
15:22:18 2008
+++ php-src/ext/soap/tests/bugs/bug39815.phpt Tue Jul 22 07:09:59 2008
@@ -23,7 +23,7 @@
$this-server-addFunction('test');
}
- function __doRequest($request, $location, $action, $version) {
+ function __doRequest($request, $location, $action, $version, $one_way = 0) {
ob_start();
$this-server-handle($request);
$response = ob_get_contents();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap/tests/bugs bug39815.phpt
dmitry Tue Jul 22 07:13:18 2008 UTC
Modified files:
/php-src/ext/soap/tests/bugsbug39815.phpt
Log:
Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug39815.phpt?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/soap/tests/bugs/bug39815.phpt
diff -u php-src/ext/soap/tests/bugs/bug39815.phpt:1.7
php-src/ext/soap/tests/bugs/bug39815.phpt:1.8
--- php-src/ext/soap/tests/bugs/bug39815.phpt:1.7 Sat May 24 15:13:09 2008
+++ php-src/ext/soap/tests/bugs/bug39815.phpt Tue Jul 22 07:13:18 2008
@@ -22,7 +22,7 @@
$this-server-addFunction('test');
}
- function __doRequest($request, $location, $action, $version) {
+ function __doRequest($request, $location, $action, $version, $one_way = 0) {
ob_start();
$this-server-handle($request);
$response = ob_get_contents();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
derick Tue Jul 22 07:33:22 2008 UTC Modified files: (Branch: PHP_4_4) /php-srcNEWS Log: - Added missing NEWS items. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.250r2=1.1247.2.920.2.251diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.250 php-src/NEWS:1.1247.2.920.2.251 --- php-src/NEWS:1.1247.2.920.2.250 Thu Jul 17 22:42:06 2008 +++ php-src/NEWSTue Jul 22 07:33:21 2008 @@ -4,6 +4,9 @@ - Updated PCRE to version 7.7. (Nuno) - Fixed crash in imageloadfont when an invalid font is given. (discovered by CzechSec, fixed by Pierre) +- Fixed open_basedir handling issue in the curl extension. (Stas) +- Fixed bug #37421 (mbstring.func_overload set in .htaccess becomes global). + (Rui) 03 Jan 2008, Version 4.4.8 - Improved fix for MOPB-02-2007. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Tue Jul 22 07:37:33 2008 UTC Modified files: (Branch: PHP_4_4) /php-src/main php_version.h /php-srcconfigure.in NEWS Log: - RC1. http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.66.2.81.2.46r2=1.66.2.81.2.47diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.46 php-src/main/php_version.h:1.66.2.81.2.47 --- php-src/main/php_version.h:1.66.2.81.2.46 Thu Jan 3 08:24:25 2008 +++ php-src/main/php_version.h Tue Jul 22 07:37:32 2008 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 4.4.9-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 4.4.9RC1 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.50r2=1.396.2.164.2.51diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.50 php-src/configure.in:1.396.2.164.2.51 --- php-src/configure.in:1.396.2.164.2.50 Thu Jan 3 08:24:25 2008 +++ php-src/configure.inTue Jul 22 07:37:33 2008 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.50 2008/01/03 08:24:25 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.51 2008/07/22 07:37:33 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -38,7 +38,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=9 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.251r2=1.1247.2.920.2.252diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.251 php-src/NEWS:1.1247.2.920.2.252 --- php-src/NEWS:1.1247.2.920.2.251 Tue Jul 22 07:33:21 2008 +++ php-src/NEWSTue Jul 22 07:37:33 2008 @@ -1,6 +1,6 @@ PHP 4 NEWS ||| -?? ?? 2008, Version 4.4.9 +22 Jul 2008, Version 4.4.9RC1 - Updated PCRE to version 7.7. (Nuno) - Fixed crash in imageloadfont when an invalid font is given. (discovered by CzechSec, fixed by Pierre) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Tue Jul 22 07:38:39 2008 UTC Modified files: (Branch: PHP_4_4) /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.66.2.81.2.47r2=1.66.2.81.2.48diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.47 php-src/main/php_version.h:1.66.2.81.2.48 --- php-src/main/php_version.h:1.66.2.81.2.47 Tue Jul 22 07:37:32 2008 +++ php-src/main/php_version.h Tue Jul 22 07:38:38 2008 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 4.4.9RC1 +#define PHP_EXTRA_VERSION RC2-dev +#define PHP_VERSION 4.4.9RC2-dev http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.396.2.164.2.51r2=1.396.2.164.2.52diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.51 php-src/configure.in:1.396.2.164.2.52 --- php-src/configure.in:1.396.2.164.2.51 Tue Jul 22 07:37:33 2008 +++ php-src/configure.inTue Jul 22 07:38:38 2008 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.51 2008/07/22 07:37:33 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.52 2008/07/22 07:38:38 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -38,7 +38,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=9 -EXTRA_VERSION=RC1 +EXTRA_VERSION=RC2-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.252r2=1.1247.2.920.2.253diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.252 php-src/NEWS:1.1247.2.920.2.253 --- php-src/NEWS:1.1247.2.920.2.252 Tue Jul 22 07:37:33 2008 +++ php-src/NEWSTue Jul 22 07:38:38 2008 @@ -1,5 +1,7 @@ PHP 4 NEWS ||| +?? Aug 2008, Version 4.4.9 + 22 Jul 2008, Version 4.4.9RC1 - Updated PCRE to version 7.7. (Nuno) - Fixed crash in imageloadfont when an invalid font is given. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /win32/build confutils.js
Hi Pierre,
AC_DEFINE hasn't been called at that stage, so the call to
configure_hdr.Remove does nothing. That's why there's a need to work around
it.
- Steph
- Original Message -
From: Pierre-Alain Joye [EMAIL PROTECTED]
To: php-cvs@lists.php.net
Sent: Monday, July 21, 2008 6:00 PM
Subject: [PHP-CVS] cvs: php-src /win32/build confutils.js
pajoye Mon Jul 21 17:00:34 2008 UTC
Modified files:
/php-src/win32/build confutils.js
Log:
- MFB: sync changes with 5.3...
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.77r2=1.78diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.77
php-src/win32/build/confutils.js:1.78
--- php-src/win32/build/confutils.js:1.77 Mon Jul 21 09:56:37 2008
+++ php-src/win32/build/confutils.js Mon Jul 21 17:00:34 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.77 2008/07/21 09:56:37 sfox Exp $
+// $Id: confutils.js,v 1.78 2008/07/21 17:00:34 pajoye Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -1123,17 +1123,23 @@
if (ext_shared) {
WARNING(extname + cannot be built: missing dependency, + dependson +
not found);
- var dllname = ' php_' + extname + '.dll';
+ if (configure_hdr.Exists('HAVE_' + EXT)) {
+ configure_hdr.Remove('HAVE_' + EXT);
+ }
+
+ dllname = ' php_' + extname + '.dll';
if (!REMOVE_TARGET(dllname, 'EXT_TARGETS')) {
REMOVE_TARGET(dllname, 'PECL_TARGETS');
}
+ extensions_enabled.pop();
return false;
- }
- ERROR(Cannot build + extname + ; + dependson + not enabled);
- return false;
+ } else {
+ ERROR(Cannot build + extname + ; + dependson + not enabled);
+ return false;
+ }
}
} // dependency is statically built-in to PHP
return true;
@@ -1325,22 +1331,12 @@
function REMOVE_TARGET(dllname, flag)
{
- var dllname = dllname.replace(/\s/g, );
- var EXT = dllname.replace(/php_(\S+)\.dll/, $1).toUpperCase();
- var php_flags = configure_subst.Item(CFLAGS_PHP);
-
if (configure_subst.Exists(flag)) {
- var targets = configure_subst.Item(flag);
-
+ targets = configure_subst.Item(flag);
if (targets.match(dllname)) {
configure_subst.Remove(flag);
targets = targets.replace(dllname, );
- targets = targets.replace(/\s+/, );
- targets = targets.replace(/\s$/, );
configure_subst.Add(flag, targets);
- configure_hdr.Add(HAVE_ + EXT, new Array(0, ));
- configure_subst.Item(CFLAGS_PHP) = php_flags.replace( /D COMPILE_DL_
+ EXT, );
- extensions_enabled.pop();
return true;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring php_mbregex.c
moriyoshi Tue Jul 22 09:18:31 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring php_mbregex.c Log: - Remove duplicated lines. http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/php_mbregex.c?r1=1.53.2.1.2.4.2.9r2=1.53.2.1.2.4.2.10diff_format=u Index: php-src/ext/mbstring/php_mbregex.c diff -u php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.9 php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.10 --- php-src/ext/mbstring/php_mbregex.c:1.53.2.1.2.4.2.9 Thu Jul 17 16:08:37 2008 +++ php-src/ext/mbstring/php_mbregex.c Tue Jul 22 09:18:30 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.9 2008/07/17 16:08:37 moriyoshi Exp $ */ +/* $Id: php_mbregex.c,v 1.53.2.1.2.4.2.10 2008/07/22 09:18:30 moriyoshi Exp $ */ #ifdef HAVE_CONFIG_H @@ -32,10 +32,6 @@ #include ext/standard/info.h #include php_mbregex.h #include mbstring.h - -#include php_onig_compat.h /* must come prior to the oniguruma header */ -#include oniguruma.h -#undef UChar #include php_onig_compat.h /* must come prior to the oniguruma header */ #include oniguruma.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
sfoxTue Jul 22 09:34:40 2008 UTC Modified files: /php-srcrun-tests.php Log: - Add missing help text http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.364r2=1.365diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.364 php-src/run-tests.php:1.365 --- php-src/run-tests.php:1.364 Mon Jul 21 16:07:57 2008 +++ php-src/run-tests.php Tue Jul 22 09:34:40 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.364 2008/07/21 16:07:57 jani Exp $ */ +/* $Id: run-tests.php,v 1.365 2008/07/22 09:34:40 sfox Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -478,7 +478,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.364 $' . \n; + echo '$Revision: 1.365 $' . \n; exit(1); default: @@ -517,7 +517,7 @@ -s file Write output to file. --x FIXME: STEPH WRITES THE HELP TEXT HERE!! +-x Sets 'SKIP_SLOW_TESTS' environmental variable. --verbose -v Verbose mode. @@ -539,8 +539,10 @@ Do not delete 'all' files, 'php' test file, 'skip' or 'clean' file. ---set-timeout -FIXME: STEPH WRITES THE HELP TEXT HERE!! +--set-timeout [n] +Set timeout for individual tests, where [n] is the number of +seconds. The default value is 60 seconds, or 300 seconds when +testing for memory leaks. --show-[all|php|skip|clean|exp|diff|out] Show 'all' files, 'php' test file, 'skip' or 'clean' file. You -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
sfoxTue Jul 22 09:35:55 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: MFH Add missing help text http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.35r2=1.226.2.37.2.35.2.36diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.35 php-src/run-tests.php:1.226.2.37.2.35.2.36 --- php-src/run-tests.php:1.226.2.37.2.35.2.35 Mon Jul 21 16:08:15 2008 +++ php-src/run-tests.php Tue Jul 22 09:35:55 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.35 2008/07/21 16:08:15 jani Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.36 2008/07/22 09:35:55 sfox Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -478,7 +478,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.35 $' . \n; + echo '$Revision: 1.226.2.37.2.35.2.36 $' . \n; exit(1); default: @@ -517,7 +517,7 @@ -s file Write output to file. --x FIXME: STEPH WRITES THE HELP TEXT HERE!! +-x Sets 'SKIP_SLOW_TESTS' environmental variable. --verbose -v Verbose mode. @@ -539,8 +539,10 @@ Do not delete 'all' files, 'php' test file, 'skip' or 'clean' file. ---set-timeout -FIXME: STEPH WRITES THE HELP TEXT HERE!! +--set-timeout [n] +Set timeout for individual tests, where [n] is the number of +seconds. The default value is 60 seconds, or 300 seconds when +testing for memory leaks. --show-[all|php|skip|clean|exp|diff|out] Show 'all' files, 'php' test file, 'skip' or 'clean' file. You -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard info.c
pajoye Tue Jul 22 10:04:53 2008 UTC
Modified files:
/php-src/ext/standard info.c
Log:
- fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.290r2=1.291diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.290 php-src/ext/standard/info.c:1.291
--- php-src/ext/standard/info.c:1.290 Mon Jul 21 09:58:28 2008
+++ php-src/ext/standard/info.c Tue Jul 22 10:04:53 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.290 2008/07/21 09:58:28 sfox Exp $ */
+/* $Id: info.c,v 1.291 2008/07/22 10:04:53 pajoye Exp $ */
#include php.h
#include php_ini.h
@@ -555,10 +555,6 @@
php_info_print_table_row(2, Configure Command,
CONFIGURE_COMMAND );
#endif
-#ifdef PHP_WIN32
- php_info_print_table_row(2, Windows Compiler and Version,
PHP_WINAPI_COMPILER );
-#endif
-
if (sapi_module.pretty_name) {
php_info_print_table_row(2, Server API,
sapi_module.pretty_name );
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c php_libxml.h
rrichards Tue Jul 22 10:29:14 2008 UTC
Modified files:
/php-src/ext/libxml libxml.c php_libxml.h
Log:
- Visibility (bug #45557)
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.68r2=1.69diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.68 php-src/ext/libxml/libxml.c:1.69
--- php-src/ext/libxml/libxml.c:1.68Mon Jul 21 09:36:41 2008
+++ php-src/ext/libxml/libxml.c Tue Jul 22 10:29:14 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.68 2008/07/21 09:36:41 bjori Exp $ */
+/* $Id: libxml.c,v 1.69 2008/07/22 10:29:14 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -523,7 +523,7 @@
}
}
-void php_libxml_ctx_error(void *ctx, const char *msg, ...)
+PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...)
{
va_list args;
va_start(args, msg);
@@ -531,7 +531,7 @@
va_end(args);
}
-void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
+PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
{
va_list args;
va_start(args, msg);
@@ -993,7 +993,7 @@
return ret_refcount;
}
-void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC)
+PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC)
{
if (!node) {
return;
@@ -1029,7 +1029,7 @@
}
}
-void php_libxml_node_decrement_resource(php_libxml_node_object *object
TSRMLS_DC)
+PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object
*object TSRMLS_DC)
{
int ret_refcount = -1;
xmlNodePtr nodep;
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/php_libxml.h?r1=1.29r2=1.30diff_format=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.29
php-src/ext/libxml/php_libxml.h:1.30
--- php-src/ext/libxml/php_libxml.h:1.29Wed Jan 30 09:56:21 2008
+++ php-src/ext/libxml/php_libxml.h Tue Jul 22 10:29:14 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.29 2008/01/30 09:56:21 dmitry Exp $ */
+/* $Id: php_libxml.h,v 1.30 2008/07/22 10:29:14 rrichards Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -86,12 +86,12 @@
PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object TSRMLS_DC);
PHP_LIBXML_API int php_libxml_register_export(zend_class_entry *ce,
php_libxml_export_node export_function);
/* When an explicit freeing of node and children is required */
-void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC);
+PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC);
/* When object dtor is called as node may still be referenced */
-void php_libxml_node_decrement_resource(php_libxml_node_object *object
TSRMLS_DC);
+PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object
*object TSRMLS_DC);
PHP_LIBXML_API void php_libxml_error_handler(void *ctx, const char *msg, ...);
-void php_libxml_ctx_warning(void *ctx, const char *msg, ...);
-void php_libxml_ctx_error(void *ctx, const char *msg, ...);
+PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...);
+PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...);
PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s);
PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC);
PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg
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_3) /ext/libxml libxml.c php_libxml.h
rrichards Tue Jul 22 10:30:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/libxml libxml.c php_libxml.h
Log:
MFH: Visibility (bug #45557)
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/libxml.c?r1=1.32.2.7.2.15.2.5r2=1.32.2.7.2.15.2.6diff_format=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.5
php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.6
--- php-src/ext/libxml/libxml.c:1.32.2.7.2.15.2.5 Mon Jul 21 09:38:04 2008
+++ php-src/ext/libxml/libxml.c Tue Jul 22 10:30:38 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.7.2.15.2.5 2008/07/21 09:38:04 bjori Exp $ */
+/* $Id: libxml.c,v 1.32.2.7.2.15.2.6 2008/07/22 10:30:38 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -523,7 +523,7 @@
}
}
-void php_libxml_ctx_error(void *ctx, const char *msg, ...)
+PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...)
{
va_list args;
va_start(args, msg);
@@ -531,7 +531,7 @@
va_end(args);
}
-void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
+PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
{
va_list args;
va_start(args, msg);
@@ -974,7 +974,7 @@
return ret_refcount;
}
-void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC)
+PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC)
{
if (!node) {
return;
@@ -1010,7 +1010,7 @@
}
}
-void php_libxml_node_decrement_resource(php_libxml_node_object *object
TSRMLS_DC)
+PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object
*object TSRMLS_DC)
{
int ret_refcount = -1;
xmlNodePtr nodep;
http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/php_libxml.h?r1=1.15.2.2.2.6.2.2r2=1.15.2.2.2.6.2.3diff_format=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.15.2.2.2.6.2.2
php-src/ext/libxml/php_libxml.h:1.15.2.2.2.6.2.3
--- php-src/ext/libxml/php_libxml.h:1.15.2.2.2.6.2.2Wed Jan 30 09:41:12 2008
+++ php-src/ext/libxml/php_libxml.h Tue Jul 22 10:30:38 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.15.2.2.2.6.2.2 2008/01/30 09:41:12 dmitry Exp $ */
+/* $Id: php_libxml.h,v 1.15.2.2.2.6.2.3 2008/07/22 10:30:38 rrichards Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -84,12 +84,12 @@
PHP_LIBXML_API xmlNodePtr php_libxml_import_node(zval *object TSRMLS_DC);
PHP_LIBXML_API int php_libxml_register_export(zend_class_entry *ce,
php_libxml_export_node export_function);
/* When an explicit freeing of node and children is required */
-void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC);
+PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node TSRMLS_DC);
/* When object dtor is called as node may still be referenced */
-void php_libxml_node_decrement_resource(php_libxml_node_object *object
TSRMLS_DC);
+PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object
*object TSRMLS_DC);
PHP_LIBXML_API void php_libxml_error_handler(void *ctx, const char *msg, ...);
-void php_libxml_ctx_warning(void *ctx, const char *msg, ...);
-void php_libxml_ctx_error(void *ctx, const char *msg, ...);
+PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...);
+PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...);
PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s);
PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC);
PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg
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/standard file.c fsock.c proc_open.c streamsfuncs.c /ext/standard/tests/file fscanf_variation10.phpt fscanf_variation16.phpt fscanf_variation22.phpt fscanf_variation29.phpt
felipe Tue Jul 22 14:06:17 2008 UTC
Modified files:
/php-src/ext/standard file.c fsock.c proc_open.c streamsfuncs.c
/php-src/ext/standard/tests/filefscanf_variation10.phpt
fscanf_variation16.phpt
fscanf_variation22.phpt
fscanf_variation29.phpt
fscanf_variation35.phpt
fscanf_variation4.phpt
fscanf_variation41.phpt
fscanf_variation47.phpt
/php-src/ext/standard/tests/strings sprintf_variation23.phpt
/php-src/main php_streams.h
/php-src/sapi/cli php_cli.c
Log:
- Fixed bug #44246 (closedir() accepts a file resource opened by fopen())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.520r2=1.521diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.520 php-src/ext/standard/file.c:1.521
--- php-src/ext/standard/file.c:1.520 Fri Jul 11 10:24:29 2008
+++ php-src/ext/standard/file.c Tue Jul 22 14:06:16 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.520 2008/07/11 10:24:29 tony2001 Exp $ */
+/* $Id: file.c,v 1.521 2008/07/22 14:06:16 felipe Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -965,6 +965,8 @@
stream = php_stream_fopen_tmpfile();
if (stream) {
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
+
php_stream_to_zval(stream, return_value);
} else {
RETURN_FALSE;
@@ -998,6 +1000,8 @@
if (stream == NULL) {
RETURN_FALSE;
}
+
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
php_stream_to_zval(stream, return_value);
}
@@ -1015,6 +1019,12 @@
}
PHP_STREAM_TO_ZVAL(stream, arg1);
+
+ if (!(stream-flags PHP_STREAM_FLAG_FCLOSE)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %d is not a valid
stream resource, stream-rsrc_id);
+ RETURN_FALSE;
+ }
+
if (!stream-is_persistent) {
zend_list_delete(stream-rsrc_id);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/fsock.c?r1=1.127r2=1.128diff_format=u
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.127 php-src/ext/standard/fsock.c:1.128
--- php-src/ext/standard/fsock.c:1.127 Mon Dec 31 07:12:15 2007
+++ php-src/ext/standard/fsock.cTue Jul 22 14:06:16 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: fsock.c,v 1.127 2007/12/31 07:12:15 sebastian Exp $ */
+/* $Id: fsock.c,v 1.128 2008/07/22 14:06:16 felipe Exp $ */
#include php.h
#include php_globals.h
@@ -79,6 +79,8 @@
stream = php_stream_xport_create(hostname, hostname_len, REPORT_ERRORS,
STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, hashkey,
tv, NULL, errstr, err);
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
+
if (port 0) {
efree(hostname);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.61r2=1.62diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.61
php-src/ext/standard/proc_open.c:1.62
--- php-src/ext/standard/proc_open.c:1.61 Tue Apr 8 08:42:05 2008
+++ php-src/ext/standard/proc_open.cTue Jul 22 14:06:16 2008
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: proc_open.c,v 1.61 2008/04/08 08:42:05 jani Exp $ */
+/* $Id: proc_open.c,v 1.62 2008/07/22 14:06:16 felipe Exp $ */
#if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -971,7 +971,7 @@
zval *retfp;
/* nasty hack; don't copy it */
- stream-flags |=
PHP_STREAM_FLAG_NO_SEEK;
+ stream-flags |=
PHP_STREAM_FLAG_NO_SEEK | PHP_STREAM_FLAG_FCLOSE;
if (UG(unicode) !binary_pipes) {
if (write_stream) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.118r2=1.119diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.118
php-src/ext/standard/streamsfuncs.c:1.119
--- php-src/ext/standard/streamsfuncs.c:1.118 Mon Jul 21 14:29:46 2008
+++ php-src/ext/standard/streamsfuncs.c Tue Jul 22 14:06:16 2008
@@ -17,7 +17,7 @@
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard file.c fsock.c proc_open.c streamsfuncs.c /ext/standard/tests/file fscanf_variation10.phpt fscanf_variation16.phpt fscanf_variation22.phpt fscanf_variati
felipe Tue Jul 22 14:09:24 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard file.c fsock.c proc_open.c streamsfuncs.c
/php-src/ext/standard/tests/filefscanf_variation10.phpt
fscanf_variation16.phpt
fscanf_variation22.phpt
fscanf_variation29.phpt
fscanf_variation35.phpt
fscanf_variation4.phpt
fscanf_variation41.phpt
fscanf_variation47.phpt
/php-src/main php_streams.h
/php-src/sapi/cli php_cli.c
Log:
- MFH: Fixed bug #44246 (closedir() accepts a file resource opened by fopen())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.17r2=1.409.2.6.2.28.2.18diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.17
php-src/ext/standard/file.c:1.409.2.6.2.28.2.18
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.17 Mon Jul 21 11:46:18 2008
+++ php-src/ext/standard/file.c Tue Jul 22 14:09:24 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.28.2.17 2008/07/21 11:46:18 jani Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.18 2008/07/22 14:09:24 felipe Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -856,6 +856,8 @@
stream = php_stream_fopen_tmpfile();
if (stream) {
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
+
php_stream_to_zval(stream, return_value);
} else {
RETURN_FALSE;
@@ -885,6 +887,8 @@
if (stream == NULL) {
RETURN_FALSE;
}
+
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
php_stream_to_zval(stream, return_value);
}
@@ -902,6 +906,12 @@
}
PHP_STREAM_TO_ZVAL(stream, arg1);
+
+ if (!(stream-flags PHP_STREAM_FLAG_FCLOSE)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %d is not a valid
stream resource, stream-rsrc_id);
+ RETURN_FALSE;
+ }
+
if (!stream-is_persistent) {
zend_list_delete(stream-rsrc_id);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/fsock.c?r1=1.121.2.1.2.1.2.1r2=1.121.2.1.2.1.2.2diff_format=u
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.121.2.1.2.1.2.1
php-src/ext/standard/fsock.c:1.121.2.1.2.1.2.2
--- php-src/ext/standard/fsock.c:1.121.2.1.2.1.2.1 Mon Dec 31 07:17:14 2007
+++ php-src/ext/standard/fsock.cTue Jul 22 14:09:24 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: fsock.c,v 1.121.2.1.2.1.2.1 2007/12/31 07:17:14 sebastian Exp $ */
+/* $Id: fsock.c,v 1.121.2.1.2.1.2.2 2008/07/22 14:09:24 felipe Exp $ */
#include php.h
#include php_globals.h
@@ -79,6 +79,8 @@
stream = php_stream_xport_create(hostname, hostname_len,
ENFORCE_SAFE_MODE | REPORT_ERRORS,
STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, hashkey,
tv, NULL, errstr, err);
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
+
if (port 0) {
efree(hostname);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.17.2.2r2=1.36.2.1.2.17.2.3diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.17.2.2
php-src/ext/standard/proc_open.c:1.36.2.1.2.17.2.3
--- php-src/ext/standard/proc_open.c:1.36.2.1.2.17.2.2 Tue Apr 8 08:42:24 2008
+++ php-src/ext/standard/proc_open.cTue Jul 22 14:09:24 2008
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: proc_open.c,v 1.36.2.1.2.17.2.2 2008/04/08 08:42:24 jani Exp $ */
+/* $Id: proc_open.c,v 1.36.2.1.2.17.2.3 2008/07/22 14:09:24 felipe Exp $ */
#if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -969,7 +969,7 @@
zval *retfp;
/* nasty hack; don't copy it */
- stream-flags |=
PHP_STREAM_FLAG_NO_SEEK;
+ stream-flags |=
PHP_STREAM_FLAG_NO_SEEK | PHP_STREAM_FLAG_FCLOSE;
MAKE_STD_ZVAL(retfp);
php_stream_to_zval(stream, retfp);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.17r2=1.58.2.6.2.15.2.18diff_format=u
Index:
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard file.c fsock.c proc_open.c streamsfuncs.c /ext/standard/tests/file fscanf_variation10.phpt fscanf_variation16.phpt fscanf_variation22.phpt fscanf_variati
felipe Tue Jul 22 14:11:26 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard file.c fsock.c proc_open.c streamsfuncs.c
/php-src/ext/standard/tests/filefscanf_variation10.phpt
fscanf_variation16.phpt
fscanf_variation22.phpt
fscanf_variation29.phpt
fscanf_variation35.phpt
fscanf_variation4.phpt
fscanf_variation41.phpt
fscanf_variation47.phpt
/php-src/main php_streams.h
/php-src/sapi/cli php_cli.c
Log:
- MFH: Fixed bug #44246 (closedir() accepts a file resource opened by fopen())
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.32r2=1.409.2.6.2.33diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.32
php-src/ext/standard/file.c:1.409.2.6.2.33
--- php-src/ext/standard/file.c:1.409.2.6.2.32 Sun May 4 21:19:17 2008
+++ php-src/ext/standard/file.c Tue Jul 22 14:11:25 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.32 2008/05/04 21:19:17 colder Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.33 2008/07/22 14:11:25 felipe Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -861,6 +861,8 @@
stream = php_stream_fopen_tmpfile();
if (stream) {
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
+
php_stream_to_zval(stream, return_value);
} else {
RETURN_FALSE;
@@ -891,6 +893,8 @@
if (stream == NULL) {
RETURN_FALSE;
}
+
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
php_stream_to_zval(stream, return_value);
@@ -912,6 +916,12 @@
}
PHP_STREAM_TO_ZVAL(stream, arg1);
+
+ if (!(stream-flags PHP_STREAM_FLAG_FCLOSE)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %d is not a valid
stream resource, stream-rsrc_id);
+ RETURN_FALSE;
+ }
+
if (!stream-is_persistent) {
zend_list_delete(stream-rsrc_id);
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/fsock.c?r1=1.121.2.1.2.2r2=1.121.2.1.2.3diff_format=u
Index: php-src/ext/standard/fsock.c
diff -u php-src/ext/standard/fsock.c:1.121.2.1.2.2
php-src/ext/standard/fsock.c:1.121.2.1.2.3
--- php-src/ext/standard/fsock.c:1.121.2.1.2.2 Mon Dec 31 07:20:12 2007
+++ php-src/ext/standard/fsock.cTue Jul 22 14:11:25 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: fsock.c,v 1.121.2.1.2.2 2007/12/31 07:20:12 sebastian Exp $ */
+/* $Id: fsock.c,v 1.121.2.1.2.3 2008/07/22 14:11:25 felipe Exp $ */
#include php.h
#include php_globals.h
@@ -79,6 +79,8 @@
stream = php_stream_xport_create(hostname, hostname_len,
ENFORCE_SAFE_MODE | REPORT_ERRORS,
STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, hashkey,
tv, NULL, errstr, err);
+ stream-flags |= PHP_STREAM_FLAG_FCLOSE;
+
if (port 0) {
efree(hostname);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.19r2=1.36.2.1.2.20diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.19
php-src/ext/standard/proc_open.c:1.36.2.1.2.20
--- php-src/ext/standard/proc_open.c:1.36.2.1.2.19 Tue Apr 8 08:45:51 2008
+++ php-src/ext/standard/proc_open.cTue Jul 22 14:11:25 2008
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: proc_open.c,v 1.36.2.1.2.19 2008/04/08 08:45:51 jani Exp $ */
+/* $Id: proc_open.c,v 1.36.2.1.2.20 2008/07/22 14:11:25 felipe Exp $ */
#if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -969,7 +969,7 @@
zval *retfp;
/* nasty hack; don't copy it */
- stream-flags |=
PHP_STREAM_FLAG_NO_SEEK;
+ stream-flags |=
PHP_STREAM_FLAG_NO_SEEK | PHP_STREAM_FLAG_FCLOSE;
MAKE_STD_ZVAL(retfp);
php_stream_to_zval(stream, retfp);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.21r2=1.58.2.6.2.22diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.21
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
felipe Tue Jul 22 14:12:54 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - BFN: #44246 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1179r2=1.2027.2.547.2.1180diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1179 php-src/NEWS:1.2027.2.547.2.1180 --- php-src/NEWS:1.2027.2.547.2.1179Mon Jul 21 20:02:34 2008 +++ php-src/NEWSTue Jul 22 14:12:54 2008 @@ -48,6 +48,8 @@ - Fixed bug #44716 (Progress notifications incorrect). (Hannes) - Fixed bug #44712 (stream_context_set_params segfaults on invalid arguments). (Hannes) +- Fixed bug #44246 (closedir() accepts a file resource opened by fopen()). + (Dmitry, Felipe) - Fixed bug #44127 (UNIX abstract namespace socket connect does not work). (Jani) - Fixed bug #41348 (OCI8: allow compilation with Oracle 8.1). (Chris Jones) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json/tests bug41504.phpt bug41567.phpt
janiTue Jul 22 14:14:31 2008 UTC
Modified files:
/php-src/ext/json/tests bug41504.phpt bug41567.phpt
Log:
- Add missing tests (thanks for being so fucking lazy Ilia!)
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug41504.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/json/tests/bug41504.phpt
diff -u /dev/null php-src/ext/json/tests/bug41504.phpt:1.2
--- /dev/null Tue Jul 22 14:14:31 2008
+++ php-src/ext/json/tests/bug41504.phptTue Jul 22 14:14:31 2008
@@ -0,0 +1,31 @@
+--TEST--
+Bug #41504 (json_decode() converts empty array keys to _empty_)
+--SKIPIF--
+?php if (!extension_loaded('json')) print 'skip'; ?
+--FILE--
+?php
+
+var_dump(json_decode('{:value}', true));
+var_dump(json_decode('{:value, key:value}', true));
+var_dump(json_decode('{key:value, :value}', true));
+
+echo Done\n;
+?
+--EXPECT--
+array(1) {
+ []=
+ string(5) value
+}
+array(2) {
+ []=
+ string(5) value
+ [key]=
+ string(5) value
+}
+array(2) {
+ [key]=
+ string(5) value
+ []=
+ string(5) value
+}
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/json/tests/bug41567.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/json/tests/bug41567.phpt
diff -u /dev/null php-src/ext/json/tests/bug41567.phpt:1.2
--- /dev/null Tue Jul 22 14:14:31 2008
+++ php-src/ext/json/tests/bug41567.phptTue Jul 22 14:14:31 2008
@@ -0,0 +1,15 @@
+--TEST--
+Bug #41567 (json_encode() double conversion is inconsistent with PHP)
+--SKIPIF--
+?php if (!extension_loaded('json')) print 'skip'; ?
+--FILE--
+?php
+
+$a = json_encode(123456789.12345);
+var_dump(json_decode($a));
+
+echo Done\n;
+?
+--EXPECT--
+float(123456789.12345)
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json php_json.h
janiTue Jul 22 14:57:46 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/json php_json.h Log: MFH: unused stuff http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.2.2.2r2=1.8.2.2.2.3diff_format=u Index: php-src/ext/json/php_json.h diff -u php-src/ext/json/php_json.h:1.8.2.2.2.2 php-src/ext/json/php_json.h:1.8.2.2.2.3 --- php-src/ext/json/php_json.h:1.8.2.2.2.2 Thu Jan 3 16:20:31 2008 +++ php-src/ext/json/php_json.h Tue Jul 22 14:57:46 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_json.h,v 1.8.2.2.2.2 2008/01/03 16:20:31 nlopess Exp $ */ +/* $Id: php_json.h,v 1.8.2.2.2.3 2008/07/22 14:57:46 jani Exp $ */ #ifndef PHP_JSON_H #define PHP_JSON_H @@ -30,15 +30,8 @@ #include TSRM.h #endif -#ifdef ZTS -#define JSON_G(v) TSRMG(json_globals_id, zend_json_globals *, v) -#else -#define JSON_G(v) (json_globals.v) -#endif - #endif /* PHP_JSON_H */ - /* * Local variables: * tab-width: 4 -- 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/json json.c
janiTue Jul 22 15:30:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/json json.c
Log:
ws + cs
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.19.2.7r2=1.9.2.19.2.8diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.19.2.7
php-src/ext/json/json.c:1.9.2.19.2.8
--- php-src/ext/json/json.c:1.9.2.19.2.7Fri Jun 27 19:16:17 2008
+++ php-src/ext/json/json.c Tue Jul 22 15:30:03 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.9.2.19.2.7 2008/06/27 19:16:17 felipe Exp $ */
+/* $Id: json.c,v 1.9.2.19.2.8 2008/07/22 15:30:03 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -31,16 +31,15 @@
#include php_json.h
static PHP_MINFO_FUNCTION(json);
-
static PHP_FUNCTION(json_encode);
static PHP_FUNCTION(json_decode);
static const char digits[] = 0123456789abcdef;
-#define PHP_JSON_HEX_TAG (10)
-#define PHP_JSON_HEX_AMP (11)
-#define PHP_JSON_HEX_APOS (12)
-#define PHP_JSON_HEX_QUOT (13)
+#define PHP_JSON_HEX_TAG (10)
+#define PHP_JSON_HEX_AMP (11)
+#define PHP_JSON_HEX_APOS (12)
+#define PHP_JSON_HEX_QUOT (13)
/* {{{ arginfo */
static
@@ -60,9 +59,9 @@
* Every user visible function must have an entry in json_functions[].
*/
static const function_entry json_functions[] = {
-PHP_FE(json_encode, arginfo_json_encode)
-PHP_FE(json_decode, arginfo_json_decode)
-{NULL, NULL, NULL} /* Must be the last line in json_functions[] */
+ PHP_FE(json_encode, arginfo_json_encode)
+ PHP_FE(json_decode, arginfo_json_decode)
+ {NULL, NULL, NULL}
};
/* }}} */
@@ -83,19 +82,19 @@
*/
zend_module_entry json_module_entry = {
#if ZEND_MODULE_API_NO = 20010901
-STANDARD_MODULE_HEADER,
+ STANDARD_MODULE_HEADER,
#endif
-json,
-json_functions,
-PHP_MINIT(json),
-NULL,
-NULL,
-NULL,
-PHP_MINFO(json),
+ json,
+ json_functions,
+ PHP_MINIT(json),
+ NULL,
+ NULL,
+ NULL,
+ PHP_MINFO(json),
#if ZEND_MODULE_API_NO = 20010901
-PHP_JSON_VERSION,
+ PHP_JSON_VERSION,
#endif
-STANDARD_MODULE_PROPERTIES
+ STANDARD_MODULE_PROPERTIES
};
/* }}} */
@@ -107,155 +106,152 @@
*/
static PHP_MINFO_FUNCTION(json)
{
-php_info_print_table_start();
-php_info_print_table_row(2, json support, enabled);
-php_info_print_table_row(2, json version, PHP_JSON_VERSION);
-php_info_print_table_end();
+ php_info_print_table_start();
+ php_info_print_table_row(2, json support, enabled);
+ php_info_print_table_row(2, json version, PHP_JSON_VERSION);
+ php_info_print_table_end();
}
/* }}} */
static void json_encode_r(smart_str *buf, zval *val, int options TSRMLS_DC);
static void json_escape_string(smart_str *buf, char *s, int len, int options
TSRMLS_DC);
-static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
+static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
{
-int i;
-HashTable *myht = HASH_OF(*val);
+ int i;
+ HashTable *myht = HASH_OF(*val);
-i = myht ? zend_hash_num_elements(myht) : 0;
-if (i 0) {
-char *key;
-ulong index, idx;
-uint key_len;
-HashPosition pos;
-
-zend_hash_internal_pointer_reset_ex(myht, pos);
-idx = 0;
-for (;; zend_hash_move_forward_ex(myht, pos)) {
-i = zend_hash_get_current_key_ex(myht, key, key_len, index, 0,
pos);
-if (i == HASH_KEY_NON_EXISTANT)
-break;
-
-if (i == HASH_KEY_IS_STRING) {
-return 1;
-} else {
-if (index != idx) {
-return 1;
-}
-}
-idx++;
-}
-}
+ i = myht ? zend_hash_num_elements(myht) : 0;
+ if (i 0) {
+ char *key;
+ ulong index, idx;
+ uint key_len;
+ HashPosition pos;
+
+ zend_hash_internal_pointer_reset_ex(myht, pos);
+ idx = 0;
+ for (;; zend_hash_move_forward_ex(myht, pos)) {
+ i = zend_hash_get_current_key_ex(myht, key, key_len,
index, 0, pos);
+ if (i == HASH_KEY_NON_EXISTANT)
+ break;
+
+ if (i == HASH_KEY_IS_STRING) {
+ return 1;
+ } else {
+ if (index != idx) {
+ return 1;
+ }
+ }
+ idx++;
+ }
+ }
-return 0;
+ return 0;
}
/* }}} */
-static void json_encode_array(smart_str *buf, zval **val, int options
TSRMLS_DC) { /* {{{ */
-int i, r;
-HashTable *myht;
-
-if
[PHP-CVS] cvs: php-src /ext/json json.c
janiTue Jul 22 15:30:33 2008 UTC
Modified files:
/php-src/ext/json json.c
Log:
ws + cs + sync with PHP_5_3
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.36 php-src/ext/json/json.c:1.37
--- php-src/ext/json/json.c:1.36Fri Jun 27 19:17:29 2008
+++ php-src/ext/json/json.c Tue Jul 22 15:30:33 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.36 2008/06/27 19:17:29 felipe Exp $ */
+/* $Id: json.c,v 1.37 2008/07/22 15:30:33 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -30,6 +30,10 @@
#include JSON_parser.h
#include php_json.h
+static PHP_MINFO_FUNCTION(json);
+static PHP_FUNCTION(json_encode);
+static PHP_FUNCTION(json_decode);
+
static const char digits[] = 0123456789abcdef;
#define PHP_JSON_HEX_TAG (10)
@@ -54,10 +58,10 @@
*
* Every user visible function must have an entry in json_functions[].
*/
-const function_entry json_functions[] = {
-PHP_FE(json_encode, arginfo_json_encode)
-PHP_FE(json_decode, arginfo_json_decode)
- {NULL, NULL, NULL} /* Must be the last line in json_functions[] */
+static const function_entry json_functions[] = {
+ PHP_FE(json_encode, arginfo_json_encode)
+ PHP_FE(json_decode, arginfo_json_decode)
+ {NULL, NULL, NULL}
};
/* }}} */
@@ -100,7 +104,7 @@
/* {{{ PHP_MINFO_FUNCTION
*/
-PHP_MINFO_FUNCTION(json)
+static PHP_MINFO_FUNCTION(json)
{
php_info_print_table_start();
php_info_print_table_row(2, json support, enabled);
@@ -165,17 +169,16 @@
return;
}
- if (r == 0)
- {
+ if (r == 0) {
smart_str_appendc(buf, '[');
- }
- else
- {
+ } else {
smart_str_appendc(buf, '{');
}
i = myht ? zend_hash_num_elements(myht) : 0;
- if (i 0) {
+
+ if (i 0)
+ {
zstr key;
zval **data;
ulong index;
@@ -205,8 +208,7 @@
json_encode_r(buf, *data, options
TSRMLS_CC);
} else if (r == 1) {
- if (i == HASH_KEY_IS_STRING ||
- i == HASH_KEY_IS_UNICODE) {
+ if (i == HASH_KEY_IS_STRING || i ==
HASH_KEY_IS_UNICODE) {
if (key.s[0] == '\0'
Z_TYPE_PP(val) == IS_OBJECT) {
/* Skip protected and
private members. */
continue;
@@ -218,7 +220,7 @@
need_comma = 1;
}
- json_escape_string(buf, key,
key_len - 1, (i==HASH_KEY_IS_UNICODE)?IS_UNICODE:IS_STRING, options TSRMLS_CC);
+ json_escape_string(buf, key,
key_len - 1, (i == HASH_KEY_IS_UNICODE) ? IS_UNICODE : IS_STRING, options
TSRMLS_CC);
smart_str_appendc(buf, ':');
json_encode_r(buf, *data,
options TSRMLS_CC);
@@ -228,7 +230,7 @@
} else {
need_comma = 1;
}
-
+
smart_str_appendc(buf, '');
smart_str_append_long(buf,
(long) index);
smart_str_appendc(buf, '');
@@ -245,12 +247,9 @@
}
}
- if (r == 0)
- {
+ if (r == 0) {
smart_str_appendc(buf, ']');
- }
- else
- {
+ } else {
smart_str_appendc(buf, '}');
}
}
@@ -264,25 +263,23 @@
unsigned short us;
unsigned short *utf16;
- if (len == 0)
- {
+ if (len == 0) {
smart_str_appendl(buf, \\, 2);
return;
}
if (type == IS_UNICODE) {
utf16 = (unsigned short *) s.u;
- } else {
+ } else {
utf16 = (unsigned short *) safe_emalloc(len, sizeof(unsigned
short), 0);
len = utf8_to_utf16(utf16, s.s, len);
- if (len = 0)
- {
+ if (len = 0) {
if (utf16) {
efree(utf16);
}
- if(len 0) {
- if(!PG(display_errors)) {
+
[PHP-CVS] cvs: php-src /ext/json php_json.h
janiTue Jul 22 15:31:00 2008 UTC Modified files: /php-src/ext/json php_json.h Log: MFB: sync http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.12r2=1.13diff_format=u Index: php-src/ext/json/php_json.h diff -u php-src/ext/json/php_json.h:1.12 php-src/ext/json/php_json.h:1.13 --- php-src/ext/json/php_json.h:1.12Thu Jan 3 16:18:27 2008 +++ php-src/ext/json/php_json.h Tue Jul 22 15:31:00 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_json.h,v 1.12 2008/01/03 16:18:27 nlopess Exp $ */ +/* $Id: php_json.h,v 1.13 2008/07/22 15:31:00 jani Exp $ */ #ifndef PHP_JSON_H #define PHP_JSON_H @@ -30,11 +30,6 @@ #include TSRM.h #endif -PHP_MINFO_FUNCTION(json); - -PHP_FUNCTION(json_encode); -PHP_FUNCTION(json_decode); - #endif /* PHP_JSON_H */ /* -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqlnd mysqlnd_ps_codec.c mysqlnd_wireprotocol.c
andrey Tue Jul 22 16:05:28 2008 UTC
Modified files:
/php-src/ext/mysqlndmysqlnd_ps_codec.c mysqlnd_wireprotocol.c
Log:
More debugging info
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps_codec.c?r1=1.10r2=1.11diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps_codec.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.10
php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.11
--- php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.10 Thu Apr 24 14:04:58 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps_codec.c Tue Jul 22 16:05:28 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_ps_codec.c,v 1.10 2008/04/24 14:04:58 andrey Exp $ */
+/* $Id: mysqlnd_ps_codec.c,v 1.11 2008/07/22 16:05:28 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -72,6 +72,8 @@
char tmp[22];
size_t tmp_len = 0;
zend_bool is_bit = field-type == MYSQL_TYPE_BIT;
+ DBG_ENTER(ps_fetch_from_1_to_8_bytes);
+ DBG_INF_FMT(zv=%p byte_count=%d, zv, byte_count);
if (field-flags UNSIGNED_FLAG) {
uint64 uval = 0;
@@ -88,6 +90,7 @@
#if SIZEOF_LONG==4
if (uval INT_MAX) {
+ DBG_INF(stringify);
tmp_len = sprintf((char *)tmp, MYSQLND_LLU_SPEC, uval);
} else
#endif /* #if SIZEOF_LONG==4 */
@@ -95,6 +98,7 @@
if (byte_count 8 || uval = L64(9223372036854775807))
{
ZVAL_LONG(zv, uval);
} else {
+ DBG_INF(stringify);
tmp_len = sprintf((char *)tmp,
MYSQLND_LLU_SPEC, uval);
}
}
@@ -115,6 +119,7 @@
#if SIZEOF_LONG==4
if ((L64(2147483647) (int64) lval) || (L64(-2147483648) (int64)
lval)) {
+ DBG_INF(stringify);
tmp_len = sprintf((char *)tmp, MYSQLND_LL_SPEC, lval);
} else
#endif /* SIZEOF */
@@ -126,14 +131,17 @@
if (tmp_len) {
#if PHP_MAJOR_VERSION = 6
if (as_unicode) {
+ DBG_INF(stringify);
ZVAL_UTF8_STRINGL(zv, tmp, tmp_len, ZSTR_DUPLICATE);
} else
#endif
{
+ DBG_INF(stringify);
ZVAL_STRINGL(zv, tmp, tmp_len, 1);
}
}
(*row)+= byte_count;
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -200,9 +208,12 @@
zend_bool as_unicode TSRMLS_DC)
{
float value;
+ DBG_ENTER(ps_fetch_float);
float4get(value, *row);
ZVAL_DOUBLE(zv, value);
(*row)+= 4;
+ DBG_INF_FMT(value=%f, value);
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -214,9 +225,12 @@
zend_bool as_unicode TSRMLS_DC)
{
double value;
+ DBG_ENTER(ps_fetch_double);
float8get(value, *row);
ZVAL_DOUBLE(zv, value);
(*row)+= 8;
+ DBG_INF_FMT(value=%f, value);
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -230,6 +244,7 @@
struct st_mysqlnd_time t;
unsigned int length; /* First byte encodes the length*/
char *to;
+ DBG_ENTER(ps_fetch_time);
if ((length = php_mysqlnd_net_field_length(row))) {
zend_uchar *to= *row;
@@ -262,6 +277,7 @@
length = spprintf(to, 0, %s%02u:%02u:%02u,
(t.neg ? - : ), t.hour, t.minute,
t.second);
+ DBG_INF_FMT(%s, to);
#if PHP_MAJOR_VERSION = 6
if (!as_unicode) {
#endif
@@ -272,6 +288,7 @@
ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);
}
#endif
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -285,6 +302,7 @@
struct st_mysqlnd_time t = {0};
unsigned int length; /* First byte encodes the length*/
char *to;
+ DBG_ENTER(ps_fetch_date);
if ((length = php_mysqlnd_net_field_length(row))) {
zend_uchar *to= *row;
@@ -310,6 +328,7 @@
*/
length = spprintf(to, 0, %04u-%02u-%02u, t.year, t.month, t.day);
+ DBG_INF_FMT(%s, to);
#if PHP_MAJOR_VERSION = 6
if (!as_unicode) {
#endif
@@ -320,6 +339,7 @@
ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);
}
#endif
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -333,6 +353,7 @@
struct st_mysqlnd_time t;
unsigned int length; /* First byte encodes the length*/
char *to;
+ DBG_ENTER(ps_fetch_datetime);
if ((length = php_mysqlnd_net_field_length(row))) {
zend_uchar *to= *row;
@@ -366,6 +387,7 @@
length = spprintf(to, 0, %04u-%02u-%02u %02u:%02u:%02u,
t.year, t.month, t.day, t.hour,
t.minute,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_ps_codec.c mysqlnd_wireprotocol.c
andrey Tue Jul 22 16:06:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_ps_codec.c mysqlnd_wireprotocol.c
Log:
More debugging info for the trace log
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_ps_codec.c?r1=1.3.2.9r2=1.3.2.10diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_ps_codec.c
diff -u php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.3.2.9
php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.3.2.10
--- php-src/ext/mysqlnd/mysqlnd_ps_codec.c:1.3.2.9 Thu Apr 24 14:22:19 2008
+++ php-src/ext/mysqlnd/mysqlnd_ps_codec.c Tue Jul 22 16:06:08 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: mysqlnd_ps_codec.c,v 1.3.2.9 2008/04/24 14:22:19 andrey Exp $ */
+/* $Id: mysqlnd_ps_codec.c,v 1.3.2.10 2008/07/22 16:06:08 andrey Exp $ */
#include php.h
#include mysqlnd.h
#include mysqlnd_wireprotocol.h
@@ -72,6 +72,8 @@
char tmp[22];
size_t tmp_len = 0;
zend_bool is_bit = field-type == MYSQL_TYPE_BIT;
+ DBG_ENTER(ps_fetch_from_1_to_8_bytes);
+ DBG_INF_FMT(zv=%p byte_count=%d, zv, byte_count);
if (field-flags UNSIGNED_FLAG) {
uint64 uval = 0;
@@ -88,6 +90,7 @@
#if SIZEOF_LONG==4
if (uval INT_MAX) {
+ DBG_INF(stringify);
tmp_len = sprintf((char *)tmp, MYSQLND_LLU_SPEC, uval);
} else
#endif /* #if SIZEOF_LONG==4 */
@@ -95,6 +98,7 @@
if (byte_count 8 || uval = L64(9223372036854775807))
{
ZVAL_LONG(zv, uval);
} else {
+ DBG_INF(stringify);
tmp_len = sprintf((char *)tmp,
MYSQLND_LLU_SPEC, uval);
}
}
@@ -115,6 +119,7 @@
#if SIZEOF_LONG==4
if ((L64(2147483647) (int64) lval) || (L64(-2147483648) (int64)
lval)) {
+ DBG_INF(stringify);
tmp_len = sprintf((char *)tmp, MYSQLND_LL_SPEC, lval);
} else
#endif /* SIZEOF */
@@ -126,14 +131,17 @@
if (tmp_len) {
#if PHP_MAJOR_VERSION = 6
if (as_unicode) {
+ DBG_INF(stringify);
ZVAL_UTF8_STRINGL(zv, tmp, tmp_len, ZSTR_DUPLICATE);
} else
#endif
{
+ DBG_INF(stringify);
ZVAL_STRINGL(zv, tmp, tmp_len, 1);
}
}
(*row)+= byte_count;
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -200,9 +208,12 @@
zend_bool as_unicode TSRMLS_DC)
{
float value;
+ DBG_ENTER(ps_fetch_float);
float4get(value, *row);
ZVAL_DOUBLE(zv, value);
(*row)+= 4;
+ DBG_INF_FMT(value=%f, value);
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -214,9 +225,12 @@
zend_bool as_unicode TSRMLS_DC)
{
double value;
+ DBG_ENTER(ps_fetch_double);
float8get(value, *row);
ZVAL_DOUBLE(zv, value);
(*row)+= 8;
+ DBG_INF_FMT(value=%f, value);
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -230,6 +244,7 @@
struct st_mysqlnd_time t;
unsigned int length; /* First byte encodes the length*/
char *to;
+ DBG_ENTER(ps_fetch_time);
if ((length = php_mysqlnd_net_field_length(row))) {
zend_uchar *to= *row;
@@ -262,6 +277,7 @@
length = spprintf(to, 0, %s%02u:%02u:%02u,
(t.neg ? - : ), t.hour, t.minute,
t.second);
+ DBG_INF_FMT(%s, to);
#if PHP_MAJOR_VERSION = 6
if (!as_unicode) {
#endif
@@ -272,6 +288,7 @@
ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);
}
#endif
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -285,6 +302,7 @@
struct st_mysqlnd_time t = {0};
unsigned int length; /* First byte encodes the length*/
char *to;
+ DBG_ENTER(ps_fetch_date);
if ((length = php_mysqlnd_net_field_length(row))) {
zend_uchar *to= *row;
@@ -310,6 +328,7 @@
*/
length = spprintf(to, 0, %04u-%02u-%02u, t.year, t.month, t.day);
+ DBG_INF_FMT(%s, to);
#if PHP_MAJOR_VERSION = 6
if (!as_unicode) {
#endif
@@ -320,6 +339,7 @@
ZVAL_UTF8_STRINGL(zv, to, length, ZSTR_AUTOFREE);
}
#endif
+ DBG_VOID_RETURN;
}
/* }}} */
@@ -333,6 +353,7 @@
struct st_mysqlnd_time t;
unsigned int length; /* First byte encodes the length*/
char *to;
+ DBG_ENTER(ps_fetch_datetime);
if ((length = php_mysqlnd_net_field_length(row))) {
zend_uchar *to= *row;
@@ -366,6 +387,7 @@
length = spprintf(to, 0, %04u-%02u-%02u %02u:%02u:%02u,
[PHP-CVS] cvs: php-src /ext/standard exec.c /ext/standard/tests/general_functions escapeshellcmd-win32.phpt
scottmacTue Jul 22 16:18:37 2008 UTC
Added files:
/php-src/ext/standard/tests/general_functions
escapeshellcmd-win32.phpt
Modified files:
/php-src/ext/standard exec.c
Log:
Add test for escapeshellcmd and restore previous behaviour with stripping %
on Windows.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.133r2=1.134diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.133 php-src/ext/standard/exec.c:1.134
--- php-src/ext/standard/exec.c:1.133 Fri May 30 16:52:06 2008
+++ php-src/ext/standard/exec.c Tue Jul 22 16:18:37 2008
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
*/
-/* $Id: exec.c,v 1.133 2008/05/30 16:52:06 scottmac Exp $ */
+/* $Id: exec.c,v 1.134 2008/07/22 16:18:37 scottmac Exp $ */
#include stdio.h
#include php.h
@@ -284,6 +284,11 @@
}
cmd[y++] = str[x];
break;
+#else
+ /* This is Windows specific for enviromental variables
*/
+ case '%':
+ cmd[y++] = '';
+ break;
#endif
case '#': /* This is character-set independent */
case '':
@@ -307,8 +312,6 @@
case '\x0A': /* excluding these two */
case '\xFF':
#ifdef PHP_WIN32
- /* This is Windows specific for enviromental variables
*/
- case '%':
cmd[y++] = '^';
#else
cmd[y++] = '\\';
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt
+++ php-src/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt
--TEST--
Test escapeshellcmd() functionality on Windows
--SKIPIF--
?php
if( substr(PHP_OS, 0, 3) != 'WIN' ) {
die('skip...Valid for Windows only');
}
?
--FILE--
?php
echo *** Testing escapeshellcmd() basic operations ***\n;
$data = array(
'abc',
'abc,
'?',
'()[]{}$',
'%^',
'#;`|*?',
'~\\'
);
$count = 1;
foreach ($data AS $value) {
echo -- Test . $count++ . --\n;
var_dump(escapeshellcmd($value));
}
echo Done\n;
?
--EXPECTF--
*** Testing escapeshellcmd() basic operations ***
-- Test 1 --
string(5) ^abc
-- Test 2 --
string(5) ^'abc
-- Test 3 --
string(6) ^?^^
-- Test 4 --
string(14) ^(^)^[^]^{^}^$
-- Test 5 --
string(2) ^^
-- Test 6 --
string(14) ^#^^;^`^|^*^?
-- Test 7 --
string(8) ^~^^^\
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard exec.c /ext/standard/tests/general_functions escapeshellcmd-win32.phpt
scottmacTue Jul 22 16:21:16 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions
escapeshellcmd-win32.phpt
Modified files:
/php-src/ext/standard exec.c
Log:
MFH: Add test for escapeshellcmd and restore previous behaviour with
stripping % on Windows.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.9r2=1.113.2.3.2.1.2.10diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.9
php-src/ext/standard/exec.c:1.113.2.3.2.1.2.10
--- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.9 Fri May 30 16:56:57 2008
+++ php-src/ext/standard/exec.c Tue Jul 22 16:21:16 2008
@@ -16,7 +16,7 @@
| Ilia Alshanetsky [EMAIL PROTECTED] |
+--+
*/
-/* $Id: exec.c,v 1.113.2.3.2.1.2.9 2008/05/30 16:56:57 scottmac Exp $ */
+/* $Id: exec.c,v 1.113.2.3.2.1.2.10 2008/07/22 16:21:16 scottmac Exp $ */
#include stdio.h
#include php.h
@@ -299,6 +299,11 @@
}
cmd[y++] = str[x];
break;
+#else
+ /* This is Windows specific for enviromental variables
*/
+ case '%':
+ cmd[y++] = '';
+ break;
#endif
case '#': /* This is character-set independent */
case '':
@@ -322,8 +327,6 @@
case '\x0A': /* excluding these two */
case '\xFF':
#ifdef PHP_WIN32
- /* This is Windows specific for enviromental variables
*/
- case '%':
cmd[y++] = '^';
#else
cmd[y++] = '\\';
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt
+++ php-src/ext/standard/tests/general_functions/escapeshellcmd-win32.phpt
--TEST--
Test escapeshellcmd() functionality on Windows
--SKIPIF--
?php
if( substr(PHP_OS, 0, 3) != 'WIN' ) {
die('skip...Valid for Windows only');
}
?
--FILE--
?php
echo *** Testing escapeshellcmd() basic operations ***\n;
$data = array(
'abc',
'abc,
'?',
'()[]{}$',
'%^',
'#;`|*?',
'~\\'
);
$count = 1;
foreach ($data AS $value) {
echo -- Test . $count++ . --\n;
var_dump(escapeshellcmd($value));
}
echo Done\n;
?
--EXPECTF--
*** Testing escapeshellcmd() basic operations ***
-- Test 1 --
string(5) ^abc
-- Test 2 --
string(5) ^'abc
-- Test 3 --
string(6) ^?^^
-- Test 4 --
string(14) ^(^)^[^]^{^}^$
-- Test 5 --
string(2) ^^
-- Test 6 --
string(14) ^#^^;^`^|^*^?
-- Test 7 --
string(8) ^~^^^\
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
johannesTue Jul 22 16:55:10 2008 UTC Modified files: /CVSROOTavail Log: Upgrade Ulf http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1424r2=1.1425diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1424 CVSROOT/avail:1.1425 --- CVSROOT/avail:1.1424Fri Jul 18 12:57:23 2008 +++ CVSROOT/avail Tue Jul 22 16:55:10 2008 @@ -241,7 +241,7 @@ avail|val|pecl/bcompiler,phpdoc avail|simenec,ttk|pecl/maxdb,phpdoc/en/reference avail|ksadlocha|pecl/simplesql -avail|uw|pecl/maxdb,php-src/ext/mysqli,php-src/ext/mysql,phpdoc +avail|uw|pecl/maxdb,php-src/ext/mysqli,php-src/ext/mysql,php-src/ext/pdo_mysql,phpdoc avail|michael,tomerc|php-src/tests avail|blindman|pecl/colorer avail|mike|pecl/http -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json json.c
janiTue Jul 22 17:06:00 2008 UTC
Modified files:
/php-src/ext/json json.c
Log:
MFB:-Â Fixed bug #38680 (Added missing handling of basic types in json_decode)
# This was claimed to be in HEAD but wasn't..some commit reverted it or
# someone didn't check for real..
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.37r2=1.38diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.37 php-src/ext/json/json.c:1.38
--- php-src/ext/json/json.c:1.37Tue Jul 22 15:30:33 2008
+++ php-src/ext/json/json.c Tue Jul 22 17:06:00 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.37 2008/07/22 15:30:33 jani Exp $ */
+/* $Id: json.c,v 1.38 2008/07/22 17:06:00 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -545,6 +545,8 @@
}
if (str_len 1 *str.s == '' str.s[str_len-1] == '') {
RETURN_STRINGL(str.s+1, str_len-2, 1);
+ } else if (*str.s == '{' || *str.s == '[') { /* invalid JSON
string */
+ RETURN_NULL();
} else {
RETURN_STRINGL(str.s, str_len, 1);
}
@@ -576,6 +578,8 @@
}
if (str_len 1 *str.u == 0x22 /*''*/ str.u[str_len-1]
== 0x22 /*''*/) {
RETURN_UNICODEL(str.u+1, str_len-2, 1);
+ } else if (*str.u == 0x7b /*'{'*/ || *str.u == 0x5b /*'['*/ ) {
/* invalid JSON string */
+ RETURN_NULL();
} else {
RETURN_UNICODEL(str.u, str_len, 1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c
andrey Tue Jul 22 17:41:15 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
Log:
MFH: Fix a leak with pconn and mysqlnd
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.22r2=1.213.2.6.2.16.2.23diff_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.22
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.23
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.22 Mon Jul 21 12:58:51 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 22 17:41:15 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.22 2008/07/21 12:58:51 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.23 2008/07/22 17:41:15 andrey Exp $ */
/* TODO:
*
@@ -963,6 +963,14 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
MySQL-Link, le_link, le_plink);
+#ifdef MYSQL_USE_MYSQLND
+ {
+ int tmp;
+ if ((mysql = zend_list_find(Z_RESVAL_PP(mysql_link), tmp))
tmp == le_plink) {
+ mysqlnd_end_psession(mysql-conn);
+ }
+ }
+#endif
if (id==-1) { /* explicit resource number */
PHPMY_UNBUFFERED_QUERY_CHECK();
zend_list_delete(Z_RESVAL_PP(mysql_link));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_mysql/tests bug_42499.phpt bug_pecl_12925.phpt bug_pecl_7976.phpt pdo_mysql___construct_uri.phpt pdo_mysql_attr_case.phpt pdo_mysql_fetch_both.phpt pdo_mysql_prepare_na
uw Tue Jul 22 18:33:29 2008 UTC
Modified files:
/php-src/ext/pdo_mysql/testsbug_42499.phpt bug_pecl_12925.phpt
bug_pecl_7976.phpt
pdo_mysql_attr_case.phpt
pdo_mysql___construct_uri.phpt
pdo_mysql_fetch_both.phpt
pdo_mysql_prepare_native_placeholder_everywhere.phpt
pdo_mysql_stmt_fetchobject.phpt
pdo_mysql_stmt_fetch_serialize.phpt
Log:
Fixing some tests to expect unicode instead of (binary) strings.
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug_42499.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug_42499.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_42499.phpt:1.1
php-src/ext/pdo_mysql/tests/bug_42499.phpt:1.2
--- php-src/ext/pdo_mysql/tests/bug_42499.phpt:1.1 Mon Jul 21 13:05:51 2008
+++ php-src/ext/pdo_mysql/tests/bug_42499.phpt Tue Jul 22 18:33:28 2008
@@ -72,7 +72,7 @@
[0]=
array(1) {
[_id]=
-string(1) a
+unicode(1) a
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug_pecl_12925.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug_pecl_12925.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_pecl_12925.phpt:1.1
php-src/ext/pdo_mysql/tests/bug_pecl_12925.phpt:1.2
--- php-src/ext/pdo_mysql/tests/bug_pecl_12925.phpt:1.1 Mon Jul 21 13:05:51 2008
+++ php-src/ext/pdo_mysql/tests/bug_pecl_12925.phpt Tue Jul 22 18:33:28 2008
@@ -56,7 +56,7 @@
[0]=
array(1) {
[id]=
-string(1) c
+unicode(1) c
}
}
done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/bug_pecl_7976.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_mysql/tests/bug_pecl_7976.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_pecl_7976.phpt:1.1
php-src/ext/pdo_mysql/tests/bug_pecl_7976.phpt:1.2
--- php-src/ext/pdo_mysql/tests/bug_pecl_7976.phpt:1.1 Mon Jul 21 13:05:51 2008
+++ php-src/ext/pdo_mysql/tests/bug_pecl_7976.phpt Tue Jul 22 18:33:28 2008
@@ -74,14 +74,14 @@
[0]=
array(1) {
[_one]=
-string(1) 1
+unicode(1) 1
}
}
array(1) {
[0]=
array(1) {
[_one]=
-string(1) 1
+unicode(1) 1
}
}
done!
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt:1.1
php-src/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt:1.2
--- php-src/ext/pdo_mysql/tests/pdo_mysql_attr_case.phpt:1.1Mon Jul 21
13:05:51 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_attr_case.phptTue Jul 22
18:33:28 2008
@@ -85,7 +85,7 @@
$db-exec(sprintf('DROP TABLE IF EXISTS test'));
print done!;
--EXPECTF--
-string(15) PDO::CASE_LOWER
+unicode(15) PDO::CASE_LOWER
array(2) {
[0]=
array(6) {
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt:1.1
php-src/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt:1.2
--- php-src/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt:1.1 Mon Jul
21 13:05:51 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql___construct_uri.phpt Tue Jul 22
18:33:28 2008
@@ -22,7 +22,7 @@
if ($fp = @fopen($file, 'w')) {
// ok, great we can create a file with a DSN in
it
- fwrite($fp, $dsn);
+ @fwrite($fp, $dsn);
fclose($fp);
clearstatcache();
assert(file_exists($file));
@@ -38,7 +38,7 @@
}
if ($fp = @fopen($file, 'w')) {
- fwrite($fp,
sprintf('mysql:dbname=letshopeinvalid;%s%s',
+ @fwrite($fp,
sprintf('mysql:dbname=letshopeinvalid;%s%s',
chr(0), $dsn));
fclose($fp);
clearstatcache();
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt
diff -u php-src/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt:1.1
php-src/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt:1.2
--- php-src/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt:1.1 Mon Jul 21
13:05:51 2008
+++ php-src/ext/pdo_mysql/tests/pdo_mysql_fetch_both.phpt Tue Jul 22
18:33:28 2008
@@ -49,7 +49,7 @@
try
[PHP-CVS] cvs: php-src / run-tests.php
felipe Tue Jul 22 19:53:00 2008 UTC Modified files: /php-srcrun-tests.php Log: - The error level must be E_ALL | E_STRICT. http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.365r2=1.366diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.365 php-src/run-tests.php:1.366 --- php-src/run-tests.php:1.365 Tue Jul 22 09:34:40 2008 +++ php-src/run-tests.php Tue Jul 22 19:53:00 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.365 2008/07/22 09:34:40 sfox Exp $ */ +/* $Id: run-tests.php,v 1.366 2008/07/22 19:53:00 felipe Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -189,7 +189,7 @@ 'safe_mode=0', 'disable_functions=', 'output_buffering=Off', - 'error_reporting=' . ((PHP_MAJOR_VERSION == 5) ? '32767' : '30719'), + 'error_reporting=' . (E_ALL | E_STRICT), 'display_errors=1', 'display_startup_errors=1', 'log_errors=0', @@ -478,7 +478,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.365 $' . \n; + echo '$Revision: 1.366 $' . \n; exit(1); default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
felipe Tue Jul 22 19:59:38 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcrun-tests.php Log: - MFH: The error level must be E_ALL | E_STRICT. http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.36r2=1.226.2.37.2.35.2.37diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.35.2.36 php-src/run-tests.php:1.226.2.37.2.35.2.37 --- php-src/run-tests.php:1.226.2.37.2.35.2.36 Tue Jul 22 09:35:55 2008 +++ php-src/run-tests.php Tue Jul 22 19:59:37 2008 @@ -24,7 +24,7 @@ +--+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.35.2.36 2008/07/22 09:35:55 sfox Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.35.2.37 2008/07/22 19:59:37 felipe Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -189,7 +189,7 @@ 'safe_mode=0', 'disable_functions=', 'output_buffering=Off', - 'error_reporting=' . ((PHP_MAJOR_VERSION == 5) ? '32767' : '30719'), + 'error_reporting=' . (E_ALL | E_STRICT), 'display_errors=1', 'display_startup_errors=1', 'log_errors=0', @@ -478,7 +478,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.35.2.36 $' . \n; + echo '$Revision: 1.226.2.37.2.35.2.37 $' . \n; exit(1); default: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/msgformat msgformat.c msgformat_data.h
stasTue Jul 22 20:25:51 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/msgformat msgformat.c msgformat_data.h
Log:
typofixes
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/msgformat/msgformat.c
diff -u php-src/ext/intl/msgformat/msgformat.c:1.1.2.2
php-src/ext/intl/msgformat/msgformat.c:1.1.2.3
--- php-src/ext/intl/msgformat/msgformat.c:1.1.2.2 Tue Jul 22 20:23:47 2008
+++ php-src/ext/intl/msgformat/msgformat.c Tue Jul 22 20:25:51 2008
@@ -26,7 +26,7 @@
#include intl_convert.h
/* {{{ */
-static msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
+static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
{
char* locale;
char* pattern;
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat_data.h?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/msgformat/msgformat_data.h
diff -u php-src/ext/intl/msgformat/msgformat_data.h:1.1.2.1
php-src/ext/intl/msgformat/msgformat_data.h:1.1.2.2
--- php-src/ext/intl/msgformat/msgformat_data.h:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/msgformat/msgformat_data.h Tue Jul 22 20:25:51 2008
@@ -36,6 +36,6 @@
msgformat_data* msgformat_data_create( TSRMLS_D );
void msgformat_data_init( msgformat_data* mf_data TSRMLS_DC );
void msgformat_data_free( msgformat_data* mf_data TSRMLS_DC );
-int msfgotmat_fix_quotes(UChar **spattern, uint32_t *spattern_len, UErrorCode
*ec);
+int msgformat_fix_quotes(UChar **spattern, uint32_t *spattern_len, UErrorCode
*ec);
#endif // MSG_FORMAT_DATA_H
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/collator collator_create.c /ext/intl/dateformat dateformat.c /ext/intl/formatter formatter_main.c /ext/intl/msgformat msgformat.c
stasTue Jul 22 20:40:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/collator collator_create.c
/php-src/ext/intl/dateformatdateformat.c
/php-src/ext/intl/formatter formatter_main.c
/php-src/ext/intl/msgformat msgformat.c
Log:
use correct locale check
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/collator/collator_create.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/collator/collator_create.c
diff -u php-src/ext/intl/collator/collator_create.c:1.1.2.2
php-src/ext/intl/collator/collator_create.c:1.1.2.3
--- php-src/ext/intl/collator/collator_create.c:1.1.2.2 Tue Jul 22 20:23:47 2008
+++ php-src/ext/intl/collator/collator_create.c Tue Jul 22 20:40:01 2008
@@ -44,7 +44,7 @@
RETURN_NULL();
}
- INTL_CHECK_LOCALE_LEN(locale_len);
+ INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
co = (Collator_object *) zend_object_store_get_object( object TSRMLS_CC
);
if(locale_len == 0) {
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/dateformat/dateformat.c
diff -u php-src/ext/intl/dateformat/dateformat.c:1.1.2.2
php-src/ext/intl/dateformat/dateformat.c:1.1.2.3
--- php-src/ext/intl/dateformat/dateformat.c:1.1.2.2Tue Jul 22 20:23:47 2008
+++ php-src/ext/intl/dateformat/dateformat.cTue Jul 22 20:40:01 2008
@@ -98,6 +98,7 @@
RETURN_NULL();
}
+ INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
DATE_FORMAT_METHOD_FETCH_OBJECT;
// Convert pattern (if specified) to UTF-16.
if( pattern_str pattern_str_len0 ){
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/formatter/formatter_main.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/formatter/formatter_main.c
diff -u php-src/ext/intl/formatter/formatter_main.c:1.1.2.2
php-src/ext/intl/formatter/formatter_main.c:1.1.2.3
--- php-src/ext/intl/formatter/formatter_main.c:1.1.2.2 Tue Jul 22 20:23:47 2008
+++ php-src/ext/intl/formatter/formatter_main.c Tue Jul 22 20:40:01 2008
@@ -45,7 +45,7 @@
RETURN_NULL();
}
- INTL_CHECK_LOCALE_LEN(locale_len);
+ INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
object = return_value;
FORMATTER_METHOD_FETCH_OBJECT;
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/intl/msgformat/msgformat.c
diff -u php-src/ext/intl/msgformat/msgformat.c:1.1.2.3
php-src/ext/intl/msgformat/msgformat.c:1.1.2.4
--- php-src/ext/intl/msgformat/msgformat.c:1.1.2.3 Tue Jul 22 20:25:51 2008
+++ php-src/ext/intl/msgformat/msgformat.c Tue Jul 22 20:40:01 2008
@@ -48,7 +48,7 @@
RETURN_NULL();
}
- INTL_CHECK_LOCALE_LEN(locale_len);
+ INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
MSG_FORMAT_METHOD_FETCH_OBJECT;
// Convert pattern (if specified) to UTF-16.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/collator collator_create.c /ext/intl/dateformat dateformat.c /ext/intl/formatter formatter_main.c /ext/intl/msgformat msgformat.c
Why aren't you merging this stuff to HEAD?
--Jani
Stanislav Malyshev kirjoitti:
stasTue Jul 22 20:40:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/collator collator_create.c
/php-src/ext/intl/dateformat dateformat.c
/php-src/ext/intl/formatter formatter_main.c
/php-src/ext/intl/msgformat msgformat.c
Log:u
use correct locale check
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/collator/collator_create.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/collator/collator_create.c
diff -u php-src/ext/intl/collator/collator_create.c:1.1.2.2
php-src/ext/intl/collator/collator_create.c:1.1.2.3
--- php-src/ext/intl/collator/collator_create.c:1.1.2.2 Tue Jul 22 20:23:47 2008
+++ php-src/ext/intl/collator/collator_create.c Tue Jul 22 20:40:01 2008
@@ -44,7 +44,7 @@
RETURN_NULL();
}
- INTL_CHECK_LOCALE_LEN(locale_len);
+ INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
co = (Collator_object *) zend_object_store_get_object( object TSRMLS_CC
);
if(locale_len == 0) {
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/dateformat/dateformat.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/dateformat/dateformat.c
diff -u php-src/ext/intl/dateformat/dateformat.c:1.1.2.2
php-src/ext/intl/dateformat/dateformat.c:1.1.2.3
--- php-src/ext/intl/dateformat/dateformat.c:1.1.2.2Tue Jul 22 20:23:47 2008
+++ php-src/ext/intl/dateformat/dateformat.cTue Jul 22 20:40:01 2008
@@ -98,6 +98,7 @@
RETURN_NULL();
}
+ INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
DATE_FORMAT_METHOD_FETCH_OBJECT;
// Convert pattern (if specified) to UTF-16.
if( pattern_str pattern_str_len0 ){
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/formatter/formatter_main.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/formatter/formatter_main.c
diff -u php-src/ext/intl/formatter/formatter_main.c:1.1.2.2
php-src/ext/intl/formatter/formatter_main.c:1.1.2.3
--- php-src/ext/intl/formatter/formatter_main.c:1.1.2.2 Tue Jul 22 20:23:47 2008
+++ php-src/ext/intl/formatter/formatter_main.c Tue Jul 22 20:40:01 2008
@@ -45,7 +45,7 @@
RETURN_NULL();
}
- INTL_CHECK_LOCALE_LEN(locale_len);
+ INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
object = return_value;
FORMATTER_METHOD_FETCH_OBJECT;
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/msgformat/msgformat.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/intl/msgformat/msgformat.c
diff -u php-src/ext/intl/msgformat/msgformat.c:1.1.2.3
php-src/ext/intl/msgformat/msgformat.c:1.1.2.4
--- php-src/ext/intl/msgformat/msgformat.c:1.1.2.3 Tue Jul 22 20:25:51 2008
+++ php-src/ext/intl/msgformat/msgformat.c Tue Jul 22 20:40:01 2008
@@ -48,7 +48,7 @@
RETURN_NULL();
}
- INTL_CHECK_LOCALE_LEN(locale_len);
+ INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
MSG_FORMAT_METHOD_FETCH_OBJECT;
// Convert pattern (if specified) to UTF-16.
--
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 exec.c
scottmacTue Jul 22 21:53:53 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard exec.c Log: Fix windows build error. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.10r2=1.113.2.3.2.1.2.11diff_format=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.10 php-src/ext/standard/exec.c:1.113.2.3.2.1.2.11 --- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.10 Tue Jul 22 16:21:16 2008 +++ php-src/ext/standard/exec.c Tue Jul 22 21:53:53 2008 @@ -16,7 +16,7 @@ | Ilia Alshanetsky [EMAIL PROTECTED] | +--+ */ -/* $Id: exec.c,v 1.113.2.3.2.1.2.10 2008/07/22 16:21:16 scottmac Exp $ */ +/* $Id: exec.c,v 1.113.2.3.2.1.2.11 2008/07/22 21:53:53 scottmac Exp $ */ #include stdio.h #include php.h @@ -302,7 +302,7 @@ #else /* This is Windows specific for enviromental variables */ case '%': - cmd[y++] = ''; + cmd[y++] = ' '; break; #endif case '#': /* This is character-set independent */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard exec.c
scottmacTue Jul 22 21:56:25 2008 UTC Modified files: /php-src/ext/standard exec.c Log: MFB: Fix windows build error. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.134r2=1.135diff_format=u Index: php-src/ext/standard/exec.c diff -u php-src/ext/standard/exec.c:1.134 php-src/ext/standard/exec.c:1.135 --- php-src/ext/standard/exec.c:1.134 Tue Jul 22 16:18:37 2008 +++ php-src/ext/standard/exec.c Tue Jul 22 21:56:25 2008 @@ -16,7 +16,7 @@ | Ilia Alshanetsky [EMAIL PROTECTED] | +--+ */ -/* $Id: exec.c,v 1.134 2008/07/22 16:18:37 scottmac Exp $ */ +/* $Id: exec.c,v 1.135 2008/07/22 21:56:25 scottmac Exp $ */ #include stdio.h #include php.h @@ -287,7 +287,7 @@ #else /* This is Windows specific for enviromental variables */ case '%': - cmd[y++] = ''; + cmd[y++] = ' '; break; #endif case '#': /* This is character-set independent */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl php_spl.c spl_iterators.c spl_iterators.h spl_observer.c spl_observer.h /ext/spl/examples multipleiterator.inc /ext/spl/internal multipleiterator.inc recursivetreeite
helly Tue Jul 22 22:54:15 2008 UTC Added files: /php-src/ext/spl/internal multipleiterator.inc /php-src/ext/spl/tests multiple_iterator_001.phpt Removed files: /php-src/ext/spl/examples multipleiterator.inc Modified files: /php-src/ext/splphp_spl.c spl_iterators.c spl_iterators.h spl_observer.c spl_observer.h /php-src/ext/spl/internal recursivetreeiterator.inc Log: - Add MultipleIterator (Arnaud, Marcus) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.136r2=1.137diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.136 php-src/ext/spl/php_spl.c:1.137 --- php-src/ext/spl/php_spl.c:1.136 Sun Jul 13 21:38:58 2008 +++ php-src/ext/spl/php_spl.c Tue Jul 22 22:54:14 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_spl.c,v 1.136 2008/07/13 21:38:58 helly Exp $ */ +/* $Id: php_spl.c,v 1.137 2008/07/22 22:54:14 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -150,14 +150,6 @@ SPL_ADD_CLASS(AppendIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(ArrayIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(ArrayObject, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplDoublyLinkedList, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplQueue, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplStack, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplHeap, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplMinHeap, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplMaxHeap, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplPriorityQueue, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplFixedArray, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(BadFunctionCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(BadMethodCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \ @@ -174,6 +166,7 @@ SPL_ADD_CLASS(LengthException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(LimitIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(LogicException, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(MultipleIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(NoRewindIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(OuterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(OutOfBoundsException, z_list, sub, allow, ce_flags); \ @@ -188,14 +181,23 @@ SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveIteratorIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveRegexIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(RecursiveTreeIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RegexIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RuntimeException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplDoublyLinkedList, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplFileInfo, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplFileObject, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplFixedArray, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplHeap, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplMinHeap, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplMaxHeap, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplObjectStorage, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplObserver, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplPriorityQueue, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplQueue, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplStack, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplSubject, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplTempFileObject, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(UnderflowException, z_list, sub, allow, ce_flags); \ http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.173r2=1.174diff_format=u Index: php-src/ext/spl/spl_iterators.c diff -u php-src/ext/spl/spl_iterators.c:1.173 php-src/ext/spl/spl_iterators.c:1.174 --- php-src/ext/spl/spl_iterators.c:1.173 Sat Jul 19 19:45:25 2008 +++ php-src/ext/spl/spl_iterators.c Tue Jul 22 22:54:14 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: spl_iterators.c,v 1.173 2008/07/19 19:45:25 colder Exp $ */ +/* $Id: spl_iterators.c,v 1.174 2008/07/22 22:54:14 helly Exp $ */ #ifdef HAVE_CONFIG_H # include config.h @@ -35,6 +35,7 @@ #include
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/spl php_spl.c spl_iterators.h spl_observer.c spl_observer.h /ext/spl/examples multipleiterator.inc /ext/spl/internal multipleiterator.inc recursivetreeit
helly Tue Jul 22 22:54:35 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/spl/internal multipleiterator.inc /php-src/ext/spl/tests multiple_iterator_001.phpt Removed files: /php-src/ext/spl/examples multipleiterator.inc Modified files: /php-srcNEWS /php-src/ext/splphp_spl.c spl_iterators.h spl_observer.c spl_observer.h /php-src/ext/spl/internal recursivetreeiterator.inc Log: - MFH Add MultipleIterator (Arnaud, Marcus) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.211r2=1.2027.2.547.2.965.2.212diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.211 php-src/NEWS:1.2027.2.547.2.965.2.212 --- php-src/NEWS:1.2027.2.547.2.965.2.211 Tue Jul 22 06:50:59 2008 +++ php-src/NEWSTue Jul 22 22:54:34 2008 @@ -118,6 +118,7 @@ . Added FixedArray. (Etienne, Tony) . Added delaying exceptions in SPL's autoload mechanism. (Marcus) . Added RecursiveTreeIterator. (Arnaud, Marcus) + . Added MultipleIterator. (Arnaud, Marcus, Johannes) - Improved Zend Engine: . Added compact handler for Zend MM storage. (Dmitry) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.22r2=1.52.2.28.2.17.2.23diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.22 php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.23 --- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.22 Sun Jul 13 21:45:07 2008 +++ php-src/ext/spl/php_spl.c Tue Jul 22 22:54:35 2008 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_spl.c,v 1.52.2.28.2.17.2.22 2008/07/13 21:45:07 helly Exp $ */ +/* $Id: php_spl.c,v 1.52.2.28.2.17.2.23 2008/07/22 22:54:35 helly Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -156,14 +156,6 @@ SPL_ADD_CLASS(AppendIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(ArrayIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(ArrayObject, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplDoublyLinkedList, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplQueue, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplStack, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplHeap, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplMinHeap, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplMaxHeap, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplPriorityQueue, z_list, sub, allow, ce_flags); \ - SPL_ADD_CLASS(SplFixedArray, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(BadFunctionCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(BadMethodCallException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \ @@ -180,6 +172,7 @@ SPL_ADD_CLASS(LengthException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(LimitIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(LogicException, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(MultipleIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(NoRewindIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(OuterIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(OutOfBoundsException, z_list, sub, allow, ce_flags); \ @@ -194,14 +187,23 @@ SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveIteratorIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RecursiveRegexIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(RecursiveTreeIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RegexIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(RuntimeException, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SeekableIterator, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SimpleXMLIterator, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplDoublyLinkedList, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplFileInfo, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplFileObject, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplFixedArray, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplHeap, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplMinHeap, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplMaxHeap, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplObjectStorage, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplObserver, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplPriorityQueue, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplQueue, z_list, sub, allow, ce_flags); \ + SPL_ADD_CLASS(SplStack, z_list, sub, allow, ce_flags); \ SPL_ADD_CLASS(SplSubject, z_list, sub, allow, ce_flags); \
[PHP-CVS] cvs: CVSROOT / avail
helly Tue Jul 22 23:13:49 2008 UTC Modified files: /CVSROOTavail Log: - Update Arnaud http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1425r2=1.1426diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1425 CVSROOT/avail:1.1426 --- CVSROOT/avail:1.1425Tue Jul 22 16:55:10 2008 +++ CVSROOT/avail Tue Jul 22 23:13:49 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb +avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb # Some people have access to tests in the Engine avail|magnus,michael,zoe,jmessa,sfox,tomerc|Zend/tests,ZendEngine2/tests @@ -293,7 +293,6 @@ avail|joonas|pecl/llvm avail|indeyets|pecl/spread avail|akshat|pecl/cairo -avail|lbarnaud|pecl/inotify # Objective-C bridge avail|wez,jan|php-objc -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql php_mysql.c /ext/mysqli mysqli_nonapi.c
andrey Tue Jul 22 23:43:14 2008 UTC
Modified files:
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_nonapi.c
Log:
Two less failing tests, one of which was definitely a leak in mysqli with
mysqlnd
and pconn. ext/mysql is being fixed with a better fix for similar leak.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.262r2=1.263diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.262 php-src/ext/mysql/php_mysql.c:1.263
--- php-src/ext/mysql/php_mysql.c:1.262 Tue Jul 22 17:40:43 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 22 23:43:14 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.262 2008/07/22 17:40:43 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.263 2008/07/22 23:43:14 andrey Exp $ */
/* TODO:
*
@@ -802,6 +802,9 @@
mysql-active_result_id = 0;
mysql-multi_query = client_flags
CLIENT_MULTI_STATEMENTS? 1:0;
/* ensure that the link did not die */
+#if defined(MYSQL_USE_MYSQLND)
+ mysqlnd_end_psession(mysql-conn);
+#endif
if (mysql_ping(mysql-conn)) {
if (mysql_errno(mysql-conn) == 2006) {
if (UG(unicode)) {
@@ -1005,15 +1008,6 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id,
MySQL-Link, le_link, le_plink);
-#ifdef MYSQL_USE_MYSQLND
- {
- int tmp;
- if ((mysql = zend_list_find(Z_RESVAL_PP(mysql_link), tmp))
tmp == le_plink) {
- mysqlnd_end_psession(mysql-conn);
- }
- }
-#endif
-
if (id==-1) { /* explicit resource number */
PHPMY_UNBUFFERED_QUERY_CHECK();
zend_list_delete(Z_RESVAL_PP(mysql_link));
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.84r2=1.85diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.84
php-src/ext/mysqli/mysqli_nonapi.c:1.85
--- php-src/ext/mysqli/mysqli_nonapi.c:1.84 Tue Jun 24 11:19:07 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Jul 22 23:43:14 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.84 2008/06/24 11:19:07 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.85 2008/07/22 23:43:14 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -157,6 +157,9 @@
mysql-mysql =
zend_ptr_stack_pop(plist-free_links);
MyG(num_inactive_persistent)--;
+#if defined(MYSQLI_USE_MYSQLND)
+
mysqlnd_end_psession(mysql-mysql);
+#endif
/* reset variables */
/* todo: option for
ping or change_user */
#if G0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysql php_mysql.c /ext/mysqli mysqli_nonapi.c
andrey Tue Jul 22 23:44:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysql php_mysql.c
/php-src/ext/mysqli mysqli_nonapi.c
Log:
MFH: Two less failing tests, one of which was definitely a leak in mysqli
with mysqlnd
and pconn. ext/mysql is being fixed with a better fix for similar leak.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.16.2.23r2=1.213.2.6.2.16.2.24diff_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.23
php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.24
--- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.16.2.23 Tue Jul 22 17:41:15 2008
+++ php-src/ext/mysql/php_mysql.c Tue Jul 22 23:44:23 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.23 2008/07/22 17:41:15 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.213.2.6.2.16.2.24 2008/07/22 23:44:23 andrey Exp $ */
/* TODO:
*
@@ -794,6 +794,9 @@
mysql-active_result_id = 0;
mysql-multi_query = client_flags
CLIENT_MULTI_STATEMENTS? 1:0;
/* ensure that the link did not die */
+#if defined(MYSQL_USE_MYSQLND)
+ mysqlnd_end_psession(mysql-conn);
+#endif
if (mysql_ping(mysql-conn)) {
if (mysql_errno(mysql-conn) == 2006) {
#ifndef MYSQL_USE_MYSQLND
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.13r2=1.54.2.7.2.5.2.14diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.13
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.14
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.13Tue Jun 24
11:01:38 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Jul 22 23:44:23 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.13 2008/06/24 11:01:38 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.14 2008/07/22 23:44:23 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -162,8 +162,12 @@
mysql-mysql =
zend_ptr_stack_pop(plist-free_links);
MyG(num_inactive_persistent)--;
+#if defined(MYSQLI_USE_MYSQLND)
+
mysqlnd_end_psession(mysql-mysql);
+#endif
/* reset variables */
/* todo: option for
ping or change_user */
+
#if G0
if
(!mysql_change_user(mysql-mysql, username, passwd, dbname)) {
#else
@@ -175,9 +179,6 @@
MyG(num_active_persistent)++;
goto end;
} else {
-#if defined(MYSQLI_USE_MYSQLND)
-
mysqlnd_end_psession(mysql-mysql);
-#endif
mysqli_close(mysql-mysql, MYSQLI_CLOSE_IMPLICIT);
mysql-mysql =
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/pgsql config.m4 pgsql.c /ext/pgsql/tests 27large_object_oid.phpt
hholzgraWed Jul 23 00:17:19 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/pgsql/tests27large_object_oid.phpt
Modified files:
/php-src/ext/pgsql config.m4 pgsql.c
Log:
added support for object ids in pg_lo_create() and pg_lo_import() where
available
(based on code provided by Tatsuo Ishii)
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/config.m4?r1=1.46.2.1.2.5r2=1.46.2.1.2.5.2.1diff_format=u
Index: php-src/ext/pgsql/config.m4
diff -u php-src/ext/pgsql/config.m4:1.46.2.1.2.5
php-src/ext/pgsql/config.m4:1.46.2.1.2.5.2.1
--- php-src/ext/pgsql/config.m4:1.46.2.1.2.5Wed Jul 11 21:51:55 2007
+++ php-src/ext/pgsql/config.m4 Wed Jul 23 00:17:19 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.46.2.1.2.5 2007/07/11 21:51:55 jani Exp $
+dnl $Id: config.m4,v 1.46.2.1.2.5.2.1 2008/07/23 00:17:19 hholzgra Exp $
dnl
PHP_ARG_WITH(pgsql,for PostgreSQL support,
@@ -92,6 +92,8 @@
AC_CHECK_LIB(pq, PQescapeStringConn,
AC_DEFINE(HAVE_PQESCAPE_CONN,1,[PostgreSQL 8.1.4 or later]))
AC_CHECK_LIB(pq, PQescapeByteaConn,
AC_DEFINE(HAVE_PQESCAPE_BYTEA_CONN,1,[PostgreSQL 8.1.4 or later]))
AC_CHECK_LIB(pq,
pg_encoding_to_char,AC_DEFINE(HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT,1,[Whether
libpq is compiled with --enable-multibyte]))
+ AC_CHECK_LIB(pq, lo_create, AC_DEFINE(HAVE_PG_LO_CREATE,1,[PostgreSQL 8.1 or
later]))
+ AC_CHECK_LIB(pq, lo_import_with_oid,
AC_DEFINE(HAVE_PG_LO_IMPORT_WITH_OID,1,[PostgreSQL 8.4 or later]))
LIBS=$old_LIBS
LDFLAGS=$old_LDFLAGS
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.24.2.9r2=1.331.2.13.2.24.2.10diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.9
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.10
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.9 Wed Jul 2 00:10:54 2008
+++ php-src/ext/pgsql/pgsql.c Wed Jul 23 00:17:19 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.331.2.13.2.24.2.9 2008/07/02 00:10:54 felipe Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.24.2.10 2008/07/23 00:17:19 hholzgra Exp $ */
#include stdlib.h
@@ -350,6 +350,7 @@
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_create, 0, 0, 0)
ZEND_ARG_INFO(0, connection)
+ ZEND_ARG_INFO(0, large_object_id)
ZEND_END_ARG_INFO()
static
@@ -392,6 +393,7 @@
ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_lo_import, 0, 0, 0)
ZEND_ARG_INFO(0, connection)
ZEND_ARG_INFO(0, filename)
+ ZEND_ARG_INFO(0, large_object_oid)
ZEND_END_ARG_INFO()
static
@@ -2992,42 +2994,75 @@
}
/* }}} */
-/* {{{ proto int pg_lo_create([resource connection])
+/* {{{ proto mixed pg_lo_create([resource connection],[mixed large_object_oid])
Create a large object */
PHP_FUNCTION(pg_lo_create)
{
- zval *pgsql_link = NULL;
- PGconn *pgsql;
- Oid pgsql_oid;
- int id = -1, argc = ZEND_NUM_ARGS();
+ zval *pgsql_link = NULL, *oid = NULL;
+ PGconn *pgsql;
+ Oid pgsql_oid, wanted_oid = InvalidOid;
+ int id = -1, argc = ZEND_NUM_ARGS();
- if (zend_parse_parameters(argc TSRMLS_CC, |r, pgsql_link) ==
FAILURE) {
+ if (zend_parse_parameters(argc TSRMLS_CC, |zz, pgsql_link, oid) ==
FAILURE) {
return;
}
+
+ if ((argc == 1) (Z_TYPE_P(pgsql_link) != IS_RESOURCE)) {
+ oid = pgsql_link;
+ pgsql_link = NULL;
+ }
- if (argc == 0) {
+ if (pgsql_link == NULL) {
id = PGG(default_link);
CHECK_DEFAULT_LINK(id);
+ if (id == -1) {
+ RETURN_FALSE;
+ }
}
- if (pgsql_link == NULL id == -1) {
- RETURN_FALSE;
- }
-
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, PostgreSQL
link, le_link, le_plink);
- /* NOTE: Archive modes not supported until I get some more data. Don't
think anybody's
- using it anyway. I believe it's also somehow related to the 'time
travel' feature of
- PostgreSQL, that's on the list of features to be removed... Create
modes not supported.
- What's the use of an object that can be only written to, but not
read from, and vice
- versa? Beats me... And the access type (r/w) must be specified again
when opening
- the object, probably (?) overrides this. (Jouni)
- */
+ if (oid) {
+#ifndef HAVE_PG_LO_CREATE
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, OID value passing
not supported);
+#else
+ switch (Z_TYPE_P(oid)) {
+ case IS_STRING:
+ {
+ char *end_ptr;
+ wanted_oid = (Oid)strtoul(Z_STRVAL_P(oid),
end_ptr, 10);
+ if ((Z_STRVAL_P(oid)+Z_STRLEN_P(oid)) !=
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl php_intl.c /ext/intl/locale locale_class.c locale_methods.c locale_methods.h /ext/intl/tests ut_common.inc
stasWed Jul 23 01:15:34 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl php_intl.c
/php-src/ext/intl/localelocale_class.c locale_methods.c
locale_methods.h
/php-src/ext/intl/tests ut_common.inc
Log:
add acceptFromHttp
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/php_intl.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/intl/php_intl.c
diff -u php-src/ext/intl/php_intl.c:1.1.2.3 php-src/ext/intl/php_intl.c:1.1.2.4
--- php-src/ext/intl/php_intl.c:1.1.2.3 Mon Jul 14 07:16:24 2008
+++ php-src/ext/intl/php_intl.c Wed Jul 23 01:15:33 2008
@@ -278,6 +278,7 @@
PHP_FE( locale_filter_matches, locale_3_args )
PHP_FE( locale_canonicalize, locale_1_arg )
PHP_FE( locale_lookup, locale_4_args )
+ PHP_FE( locale_accept_from_http, locale_1_arg )
// MessageFormatter functions
PHP_FE( msgfmt_create, NULL )
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_class.c?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/locale/locale_class.c
diff -u php-src/ext/intl/locale/locale_class.c:1.1.2.1
php-src/ext/intl/locale/locale_class.c:1.1.2.2
--- php-src/ext/intl/locale/locale_class.c:1.1.2.1 Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/locale/locale_class.c Wed Jul 23 01:15:33 2008
@@ -89,6 +89,7 @@
ZEND_FENTRY( filterMatches, ZEND_FN( locale_filter_matches ),
locale_3_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
ZEND_FENTRY( lookup, ZEND_FN( locale_lookup ), locale_4_args,
ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
ZEND_FENTRY( canonicalize, ZEND_FN( locale_canonicalize ), locale_1_arg
, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
+ ZEND_FENTRY( acceptFromHttp, ZEND_FN( locale_accept_from_http ),
locale_1_arg , ZEND_ACC_PUBLIC|ZEND_ACC_STATIC )
{ NULL, NULL, NULL }
};
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/locale/locale_methods.c?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/locale/locale_methods.c
diff -u php-src/ext/intl/locale/locale_methods.c:1.1.2.1
php-src/ext/intl/locale/locale_methods.c:1.1.2.2
--- php-src/ext/intl/locale/locale_methods.c:1.1.2.1Mon Jul 7 22:51:03 2008
+++ php-src/ext/intl/locale/locale_methods.cWed Jul 23 01:15:33 2008
@@ -21,12 +21,14 @@
#include unicode/ustring.h
#include unicode/udata.h
#include unicode/putil.h
+#include unicode/ures.h
#include php_intl.h
#include locale.h
#include locale_class.h
#include locale_methods.h
#include intl_convert.h
+#include intl_data.h
#include zend_API.h
#include zend.h
@@ -424,12 +426,10 @@
}
/* }}} */
-/* {{{
- * proto public static string Locale::getScript($locale)
+/* {{{ proto static string Locale::getScript($locale)
* gets the script for the $locale
}}} */
-/* {{{
- * proto public static string locale_get_script($locale)
+/* {{{ proto static string locale_get_script($locale)
* gets the script for the $locale
*/
PHP_FUNCTION( locale_get_script )
@@ -438,12 +438,10 @@
}
/* }}} */
-/* {{{
- * proto public static string Locale::getRegion($locale)
+/* {{{ proto static string Locale::getRegion($locale)
* gets the region for the $locale
}}} */
-/* {{{
- * proto public static string locale_get_region($locale)
+/* {{{ proto static string locale_get_region($locale)
* gets the region for the $locale
*/
PHP_FUNCTION( locale_get_region )
@@ -452,12 +450,10 @@
}
/* }}} */
-/* {{{
- * proto public static string Locale::getPrimaryLanguage($locale)
+/* {{{ proto static string Locale::getPrimaryLanguage($locale)
* gets the primary language for the $locale
}}} */
-/* {{{
- * proto public static string locale_get_primary_language($locale)
+/* {{{ proto static string locale_get_primary_language($locale)
* gets the primary language for the $locale
*/
PHP_FUNCTION(locale_get_primary_language )
@@ -607,12 +603,10 @@
}
/* }}} */
-/* {{{
-* public static string Locale::getDisplayName($locale, $in_locale = null)
+/* {{{ proto static string Locale::getDisplayName($locale[, $in_locale = null])
* gets the name for the $locale in $in_locale or default_locale
}}} */
-/* {{{
-* public static string get_display_name($locale, $in_locale = null)
+/* {{{ proto static string get_display_name($locale[, $in_locale = null])
* gets the name for the $locale in $in_locale or default_locale
*/
PHP_FUNCTION(locale_get_display_name)
@@ -621,12 +615,10 @@
}
/* }}} */
-/* {{{
-* public static string Locale::getDisplayLanguage($locale, $in_locale = null)
+/* {{{ proto static string Locale::getDisplayLanguage($locale[, $in_locale =
null])
* gets the language for the $locale in $in_locale or default_locale
}}} */
-/* {{{
-* public static string get_display_language($locale, $in_locale = null)
+/* {{{ proto static string get_display_language($locale[, $in_locale = null])
* gets the language for the $locale in $in_locale or default_locale
*/
