tony2001 Thu Apr 5 07:10:07 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/openssl openssl.c
Log:
fix ZTS build
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.30&r2=1.98.2.5.2.31&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.30
php-src/ext/openssl/openssl.c:1.98.2.5.2.31
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.30 Wed Apr 4 22:00:51 2007
+++ php-src/ext/openssl/openssl.c Thu Apr 5 07:10:07 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.30 2007/04/04 22:00:51 pajoye Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.31 2007/04/05 07:10:07 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1333,7 +1333,7 @@
sk_X509_free(sk);
}
-static STACK_OF(X509) * php_array_to_X509_sk(zval ** zcerts)
+static STACK_OF(X509) * php_array_to_X509_sk(zval ** zcerts TSRMLS_DC)
{
HashPosition hpos;
zval ** zcertval;
@@ -1436,7 +1436,7 @@
*/
if (args && zend_hash_find(Z_ARRVAL_P(args), "extracerts",
sizeof("extracerts"), (void**)&item) == SUCCESS)
- ca = php_array_to_X509_sk(item);
+ ca = php_array_to_X509_sk(item TSRMLS_CC);
/* end parse extra config */
/*PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509
*cert, STACK_OF(X509) *ca,
@@ -1510,7 +1510,7 @@
friendly_name = Z_STRVAL_PP(item);
if (args && zend_hash_find(Z_ARRVAL_P(args), "extracerts",
sizeof("extracerts"), (void**)&item) == SUCCESS)
- ca = php_array_to_X509_sk(item);
+ ca = php_array_to_X509_sk(item TSRMLS_CC);
/* end parse extra config */
p12 = PKCS12_create(pass, friendly_name, priv_key, cert, ca, 0, 0, 0,
0, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
