[PHP-CVS] cvs: php-src(PHP_5_3) /ext/hash/tests skip_mhash.inc
felipe Sun Oct 26 23:34:14 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/hash/tests skip_mhash.inc Log: - Fixed condition http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/skip_mhash.inc?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/ext/hash/tests/skip_mhash.inc diff -u php-src/ext/hash/tests/skip_mhash.inc:1.1.2.1 php-src/ext/hash/tests/skip_mhash.inc:1.1.2.2 --- php-src/ext/hash/tests/skip_mhash.inc:1.1.2.1 Thu Jun 26 22:33:16 2008 +++ php-src/ext/hash/tests/skip_mhash.inc Sun Oct 26 23:34:13 2008 @@ -1,5 +1,5 @@ \ No newline at end of file +?> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/hash/tests skip_mhash.inc
felipe Sun Oct 26 23:33:33 2008 UTC Modified files: /php-src/ext/hash/tests skip_mhash.inc Log: - Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/hash/tests/skip_mhash.inc?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/hash/tests/skip_mhash.inc diff -u php-src/ext/hash/tests/skip_mhash.inc:1.2 php-src/ext/hash/tests/skip_mhash.inc:1.3 --- php-src/ext/hash/tests/skip_mhash.inc:1.2 Sat Jun 28 15:20:49 2008 +++ php-src/ext/hash/tests/skip_mhash.inc Sun Oct 26 23:33:32 2008 @@ -1,5 +1,5 @@ \ No newline at end of file +?> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: SVNROOT / run-conversion.php
gwynne Sun Oct 26 23:09:41 2008 UTC
Modified files:
/SVNROOTrun-conversion.php
Log:
Rewrote conversion script to use Console_CommandLine and verbosity levels.
http://cvs.php.net/viewvc.cgi/SVNROOT/run-conversion.php?r1=1.1&r2=1.2&diff_format=u
Index: SVNROOT/run-conversion.php
diff -u SVNROOT/run-conversion.php:1.1 SVNROOT/run-conversion.php:1.2
--- SVNROOT/run-conversion.php:1.1 Fri Oct 24 02:45:27 2008
+++ SVNROOT/run-conversion.php Sun Oct 26 23:09:41 2008
@@ -1,46 +1,97 @@
SVN respository conversion version {$version}.\n";
-print "Started at " . date(DATE_RFC2822) . "\n";
+require_once 'Console/CommandLine.php';
-$CVSROOT = "/home/repository";
-$SVNROOT = "/home/repository-svn";
-
-$do_cvs2svn = TRUE;
-$do_svnrm = TRUE;
-$do_reorg = TRUE;
+$cmdline_parser = new Console_CommandLine(array(
+'description' => 'PHP Group CVS->SVN respository converter',
+'version' => $version,
+));
+$cmdline_parser->addOption('verbose', array(
+'short_name' => '-v',
+'long_name' => '--verbose',
+'default' => 1,
+'description' => 'Verbosity of output. Specify multiple times to increase
verbosity.',
+'action' => 'Counter'));
+$cmdline_parser->addOption('cvsroot', array(
+'short_name' => '-c',
+'long_name' => '--cvsroot',
+'default' => '/home/repository',
+'description' => 'Specify the CVS repository to operate on.',
+'action' => 'StoreString'));
+$cmdline_parser->addOption('svnroot', array(
+'short_name' => '-s',
+'long_name' => '--svnroot',
+'default' => '/home/repository-svn',
+'description' => 'Specify the SVN repository to create.',
+'action' => 'StoreString'));
+$cmdline_parser->addOption('pass', array(
+'short_name' => '-p',
+'long_name' => '--pass',
+'default' => NULL,
+'description' => 'Which pass to run. One of: svncreate, cvs2svn, svnrm,
reorg. If not specified, all passes will run.',
+'action' => 'StoreString',
+'choices' => array('svncreate', 'cvs2svn', 'svnrm', 'reorg')));
+
+try {
+$result = $cmdline_parser->parse();
+$options = $result->options;
+} catch (Exception $ex) {
+$parser->displayError($ex->getMessage());
+exit(1);
+}
-function is_option($optName, $arg, &$value)
+function v($level, $message)
{
-if (strncmp($arg, $optName, strlen($optName)) == 0) {
-if (!is_null($value)) {
-$value = substr($arg, strlen($optName) + 1);
-}
-return true;
+if ($GLOBALS['options']['verbose'] >= $level) {
+print $message;
}
-return false;
}
-foreach ($argv as $i => $arg) {
-if (is_option("--cvsroot", $arg, $value)) {
-$CVSROOT = $value;
-} else if (is_option("--svnroot", $arg, $value)) {
-$SVNROOT = $value;
-} else if (is_option("--cvs2svn", $arg, $value)) {
-$do_cvs2svn = ($value == 'true');
-} else if (is_option("--svnrm", $arg, $value)) {
-$do_svnrm = ($value == 'true');
-} else if (is_option("--reorg", $arg, $value)) {
-$do_reorg = ($value == 'true');
+function error($message, $status = 1)
+{
+print $message;
+exit($status);
+}
+
+if (!is_dir($options['cvsroot']) || !is_readable($options['cvsroot']) ||
!is_executable($options['cvsroot'])) {
+error("CVS root directory must exist, be a directory, and be readable and
searchable.\n");
+}
+
+if (is_null($options['pass']) || $options['pass'] == 'svncreate') {
+if (file_exists($options['svnroot'])) {
+error("SVN root directory can not exist if running the svncreate
pass.\n");
+}
+if (!is_dir(dirname($options['svnroot'])) ||
!is_writable(dirname($options['svnroot']))) {
+error("SVN root directory parent must exist, be a directory, and be
writable if running the svncreate pass.\n");
+}
+} else if (!is_dir($options['svnroot']) || !is_writable($options['svnroot'])) {
+error("SVN root directory must exist and be writeable if not running the
svncreate pass.\n");
+}
+
+v(1, "PHP Group CVS->SVN respository conversion.\n");
+v(1, "Started at " . date(DATE_RFC2822) . "\n");
+
+if (is_null($options['pass']) || $options['pass'] == 'svncreate') {
+v(1, "Running svncreate pass...\n");
+
+$command = "exec svnadmin create {$options['svnroot']} 2>&1";
+v(2, "Running: '{$command}'...");
+exec($command, $output, $exitstatus);
+if ($exitstatus != 0) {
+error("\nAn error occurred. Exit status was {$exitstatus}. Output:\n"
. implode("\n", $output) . "\n", $exitstatus);
}
+v(2, " done.\n");
+v(3, "Output:\n" . implode("\n", $output) . "\n");
}
-if ($do_cvs2svn) {
-print "Running cvs2svn...\n";
+if (is_null($options['pass']) || $options['pass'] == 'cvs2svn') {
+v(1, "Running cvs2svn pass...\n");
-$cvs2svn_process = proc_open("cvs2svn --options=phpsvn.options", array(
+$command = "exec cvs2svn --options=phpsvn.options";
+v(2, "Running: '{$command} > ./phpsvn.conversion.out 2>&php'...");
+
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/basic bug46313.phpt
felipe Sun Oct 26 23:00:53 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/basicbug46313.phpt Log: - Fixed test http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug46313.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u Index: php-src/tests/basic/bug46313.phpt diff -u php-src/tests/basic/bug46313.phpt:1.1.4.2 php-src/tests/basic/bug46313.phpt:1.1.4.3 --- php-src/tests/basic/bug46313.phpt:1.1.4.2 Mon Oct 20 18:45:24 2008 +++ php-src/tests/basic/bug46313.phpt Sun Oct 26 23:00:53 2008 @@ -36,7 +36,7 @@ ["type"]=> string(16) "text/plain-file1" ["tmp_name"]=> -string(14) "%s" +string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -49,7 +49,7 @@ ["type"]=> string(16) "text/plain-file2" ["tmp_name"]=> -string(14) "%s" +string(%d) "%s" ["error"]=> int(0) ["size"]=> -- 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) /tests/basic bug46313.phpt
felipe Sun Oct 26 23:00:36 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/tests/basicbug46313.phpt Log: - Fixed test http://cvs.php.net/viewvc.cgi/php-src/tests/basic/bug46313.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/tests/basic/bug46313.phpt diff -u php-src/tests/basic/bug46313.phpt:1.1.2.1 php-src/tests/basic/bug46313.phpt:1.1.2.2 --- php-src/tests/basic/bug46313.phpt:1.1.2.1 Mon Oct 20 17:09:10 2008 +++ php-src/tests/basic/bug46313.phpt Sun Oct 26 23:00:35 2008 @@ -36,7 +36,7 @@ ["type"]=> string(16) "text/plain-file1" ["tmp_name"]=> -string(14) "%s" +string(%d) "%s" ["error"]=> int(0) ["size"]=> @@ -49,7 +49,7 @@ ["type"]=> string(16) "text/plain-file2" ["tmp_name"]=> -string(14) "%s" +string(%d) "%s" ["error"]=> int(0) ["size"]=> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / php.ini-recommended
kalle Sun Oct 26 15:39:44 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-recommended Log: MFB: Fixed #44748 (php.ini comments on magic_quotes_gpc promote bad practices) http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.24&r2=1.179.2.11.2.25&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.24 php-src/php.ini-recommended:1.179.2.11.2.25 --- php-src/php.ini-recommended:1.179.2.11.2.24 Mon Feb 11 00:01:29 2008 +++ php-src/php.ini-recommended Sun Oct 26 15:39:44 2008 @@ -95,7 +95,8 @@ ; - magic_quotes_gpc = Off [Performance] ; Input data is no longer escaped with slashes so that it can be sent into ; SQL databases without further manipulation. Instead, you should use the -; function addslashes() on each input element you wish to send to a database. +; database vendor specific escape string function on each input element you +; wish to send to a database. ; - variables_order = "GPCS" [Performance] ; The environment variables are not hashed into the $_ENV. To access ; environment variables, you can use getenv() instead. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-recommended
kalle Sun Oct 26 15:38:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-recommended Log: Fixed #44748 (php.ini comments on magic_quotes_gpc promote bad practices) http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.23.2.10&r2=1.179.2.11.2.23.2.11&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.23.2.10 php-src/php.ini-recommended:1.179.2.11.2.23.2.11 --- php-src/php.ini-recommended:1.179.2.11.2.23.2.10Thu Aug 28 05:31:31 2008 +++ php-src/php.ini-recommended Sun Oct 26 15:38:47 2008 @@ -95,7 +95,8 @@ ; - magic_quotes_gpc = Off [Performance] ; Input data is no longer escaped with slashes so that it can be sent into ; SQL databases without further manipulation. Instead, you should use the -; function addslashes() on each input element you wish to send to a database. +; database vendor specific escape string function on each input element you +; wish to send to a database. ; - variables_order = "GPCS" [Performance] ; The environment variables are not hashed into the $_ENV. To access ; environment variables, you can use getenv() instead. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
iliaa Sun Oct 26 14:36:25 2008 UTC
Modified files:
/php-src/ext/opensslopenssl.c
Log:
MFB: Fixed compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.172&r2=1.173&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.172 php-src/ext/openssl/openssl.c:1.173
--- php-src/ext/openssl/openssl.c:1.172 Fri Oct 24 14:34:14 2008
+++ php-src/ext/openssl/openssl.c Sun Oct 26 14:36:25 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.172 2008/10/24 14:34:14 felipe Exp $ */
+/* $Id: openssl.c,v 1.173 2008/10/26 14:36:25 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3637,7 +3637,7 @@
}
}
- BIO_reset(infile);
+ (void)BIO_reset(infile);
/* write the encrypted data */
SMIME_write_PKCS7(outfile, p7, infile, flags);
@@ -3732,7 +3732,7 @@
goto clean_exit;
}
- BIO_reset(infile);
+ (void)BIO_reset(infile);
/* tack on extra headers */
if (zheaders) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/openssl openssl.c
iliaa Sun Oct 26 14:36:00 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/opensslopenssl.c
Log:
MFB: Fixed compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.47&r2=1.98.2.5.2.48&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.47
php-src/ext/openssl/openssl.c:1.98.2.5.2.48
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.47 Tue Oct 14 23:40:25 2008
+++ php-src/ext/openssl/openssl.c Sun Oct 26 14:35:59 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.47 2008/10/14 23:40:25 iliaa Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.48 2008/10/26 14:35:59 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3010,7 +3010,7 @@
}
}
- BIO_reset(infile);
+ (void)BIO_reset(infile);
/* write the encrypted data */
SMIME_write_PKCS7(outfile, p7, infile, flags);
@@ -3099,7 +3099,7 @@
goto clean_exit;
}
- BIO_reset(infile);
+ (void)BIO_reset(infile);
/* tack on extra headers */
if (zheaders) {
--
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/openssl openssl.c
iliaa Sun Oct 26 14:35:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/opensslopenssl.c
Log:
Fixed compiler warning
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.21&r2=1.98.2.5.2.41.2.22&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.21
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.22
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.21Fri Oct 24 14:35:36 2008
+++ php-src/ext/openssl/openssl.c Sun Oct 26 14:35:41 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.21 2008/10/24 14:35:36 felipe Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.22 2008/10/26 14:35:41 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3439,7 +3439,7 @@
}
}
- BIO_reset(infile);
+ (void)BIO_reset(infile);
/* write the encrypted data */
SMIME_write_PKCS7(outfile, p7, infile, flags);
@@ -3528,7 +3528,7 @@
goto clean_exit;
}
- BIO_reset(infile);
+ (void)BIO_reset(infile);
/* tack on extra headers */
if (zheaders) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard streamsfuncs.c
felipe Sun Oct 26 13:48:16 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard streamsfuncs.c
/php-srcNEWS
Log:
- MFH: Fixed bug #46388 (stream_notification_callback inside of object
destroys object variables)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.23&r2=1.58.2.6.2.24&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.23
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.24
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.23 Wed Jul 23 11:25:50 2008
+++ php-src/ext/standard/streamsfuncs.c Sun Oct 26 13:48:15 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.23 2008/07/23 11:25:50 tony2001 Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.24 2008/10/26 13:48:15 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -819,12 +819,13 @@
INIT_ZVAL(zvs[i]);
ps[i] = &zvs[i];
ptps[i] = &ps[i];
+ MAKE_STD_ZVAL(ps[i]);
}
ZVAL_LONG(ps[0], notifycode);
ZVAL_LONG(ps[1], severity);
if (xmsg) {
- ZVAL_STRING(ps[2], xmsg, 0);
+ ZVAL_STRING(ps[2], xmsg, 1);
} else {
ZVAL_NULL(ps[2]);
}
@@ -835,6 +836,9 @@
if (FAILURE == call_user_function_ex(EG(function_table), NULL,
callback, &retval, 6, ptps, 0, NULL TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to call
user notifier");
}
+ for (i = 0; i < 6; i++) {
+ zval_ptr_dtor(&ps[i]);
+ }
if (retval) {
zval_ptr_dtor(&retval);
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1280&r2=1.2027.2.547.2.1281&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1280 php-src/NEWS:1.2027.2.547.2.1281
--- php-src/NEWS:1.2027.2.547.2.1280Sun Oct 26 11:27:06 2008
+++ php-src/NEWSSun Oct 26 13:48:16 2008
@@ -3,6 +3,8 @@
?? Nov 2008, PHP 5.2.7RC3
- Fixed bug #46389 (NetWare needs small patch for _timezone).
(patch by [EMAIL PROTECTED])
+- Fixed bug #46388 (stream_notification_callback inside of object destroys
+ object variables). (Felipe)
- Fixed bug #46381 (wrong $this passed to internal methods causes segfault).
(Tony)
- Fixed bug #46082 (stream_set_blocking() can cause a crash in some
--
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 streamsfuncs.c
felipe Sun Oct 26 13:25:06 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard streamsfuncs.c
Log:
- MFH: Fixed bug #46388 (stream_notification_callback inside of object
destroys object variables)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.23&r2=1.58.2.6.2.15.2.24&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.23
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.24
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.23 Tue Oct 21
22:08:37 2008
+++ php-src/ext/standard/streamsfuncs.c Sun Oct 26 13:25:06 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.23 2008/10/21 22:08:37 lbarnaud Exp $
*/
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.24 2008/10/26 13:25:06 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -829,12 +829,13 @@
INIT_ZVAL(zvs[i]);
ps[i] = &zvs[i];
ptps[i] = &ps[i];
+ MAKE_STD_ZVAL(ps[i]);
}
ZVAL_LONG(ps[0], notifycode);
ZVAL_LONG(ps[1], severity);
if (xmsg) {
- ZVAL_STRING(ps[2], xmsg, 0);
+ ZVAL_STRING(ps[2], xmsg, 1);
} else {
ZVAL_NULL(ps[2]);
}
@@ -845,6 +846,9 @@
if (FAILURE == call_user_function_ex(EG(function_table), NULL,
callback, &retval, 6, ptps, 0, NULL TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to call
user notifier");
}
+ for (i = 0; i < 6; i++) {
+ zval_ptr_dtor(&ps[i]);
+ }
if (retval) {
zval_ptr_dtor(&retval);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c
felipe Sun Oct 26 13:22:00 2008 UTC
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
- Fixed bug #46388 (stream_notification_callback inside of object destroys
object variables)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.124&r2=1.125&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.124
php-src/ext/standard/streamsfuncs.c:1.125
--- php-src/ext/standard/streamsfuncs.c:1.124 Tue Oct 21 22:06:48 2008
+++ php-src/ext/standard/streamsfuncs.c Sun Oct 26 13:22:00 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.124 2008/10/21 22:06:48 lbarnaud Exp $ */
+/* $Id: streamsfuncs.c,v 1.125 2008/10/26 13:22:00 felipe Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -871,12 +871,13 @@
INIT_ZVAL(zvs[i]);
ps[i] = &zvs[i];
ptps[i] = &ps[i];
+ MAKE_STD_ZVAL(ps[i]);
}
ZVAL_LONG(ps[0], notifycode);
ZVAL_LONG(ps[1], severity);
if (xmsg) {
- ZVAL_RT_STRING(ps[2], xmsg, ZSTR_AUTOFREE);
+ ZVAL_RT_STRING(ps[2], xmsg, ZSTR_DUPLICATE);
} else {
ZVAL_NULL(ps[2]);
}
@@ -887,6 +888,9 @@
if (FAILURE == call_user_function_ex(EG(function_table), NULL,
callback, &retval, 6, ptps, 0, NULL TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "failed to call
user notifier");
}
+ for (i = 0; i < 6; i++) {
+ zval_ptr_dtor(&ps[i]);
+ }
if (retval) {
zval_ptr_dtor(&retval);
}
--
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
derick Sun Oct 26 12:56:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Fixed NEWS entries. http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.351&r2=1.2027.2.547.2.965.2.352&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.351 php-src/NEWS:1.2027.2.547.2.965.2.352 --- php-src/NEWS:1.2027.2.547.2.965.2.351 Thu Oct 23 20:23:57 2008 +++ php-src/NEWSSun Oct 26 12:56:46 2008 @@ -323,7 +323,8 @@ . date_create_from_format() / DateTime::createFromFormat() . date_parse_from_format(). . support for abbreviation and offset based timezone specifiers for -DateTime::getOffset() and DateTime::getName(). +the 'e' format specifier, DateTime::__construct(), DateTime::getTimeZone() +and DateTimeZone::getName(). . support for selectively listing timezone identifiers by continent or country code through timezone_identifiers_list() / DateTimezone::listIdentifiers(). @@ -349,7 +350,7 @@ . proper support for "this week", "previous week"/"last week" and "next week" phrases so that they actually mean the week and not a seven day period around the current day. - . support for " of" phrases to be used + . support for " of" and "last of" phrases to be used with months - like in "last saturday of februari 2008". . support for "back of " and "front of " phrases that are used in Scotland. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
