felipe Fri Jun 13 13:06:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.c util.c
Log:
- Fix build (ZTS)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.13&r2=1.370.2.14&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.13 php-src/ext/phar/phar.c:1.370.2.14
--- php-src/ext/phar/phar.c:1.370.2.13 Fri Jun 13 06:34:41 2008
+++ php-src/ext/phar/phar.c Fri Jun 13 13:06:46 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar.c,v 1.370.2.13 2008/06/13 06:34:41 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.14 2008/06/13 13:06:46 felipe Exp $ */
#define PHAR_MAIN 1
#include "phar_internal.h"
@@ -610,6 +610,8 @@
{
int pos = -1;
size_t len = 0;
+
+ TSRMLS_FETCH();
*signature = (char*)safe_pemalloc(digest_len, 2, 1, PHAR_G(persist));
@@ -3533,7 +3535,7 @@
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.13 $");
+ php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.14 $");
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.5&r2=1.55.2.6&diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.5 php-src/ext/phar/util.c:1.55.2.6
--- php-src/ext/phar/util.c:1.55.2.5 Fri Jun 13 06:34:41 2008
+++ php-src/ext/phar/util.c Fri Jun 13 13:06:46 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: util.c,v 1.55.2.5 2008/06/13 06:34:41 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.6 2008/06/13 13:06:46 felipe Exp $ */
#include "phar_internal.h"
#ifdef PHAR_HAVE_OPENSSL
@@ -1344,6 +1344,8 @@
{
int pos = -1;
size_t len = 0;
+
+ TSRMLS_FETCH();
*signature = (char*)safe_pemalloc(digest_len, 2, 1, PHAR_G(persist));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
