cvs: php4(PHP_4_3) /ext/openssl openssl.c php_openssl.h
| From: | Wez Furlong | Date: | Tue, 29 Apr 2003 13:48:05 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/openssl openssl.c php_openssl.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20584@lists.php.net to get a copy of this message | ||
wez Tue Apr 29 09:48:05 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/openssl openssl.c php_openssl.h
Log:
Fix win32 build of shared openssl extension.
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.52.2.10 php4/ext/openssl/openssl.c:1.52.2.11
--- php4/ext/openssl/openssl.c:1.52.2.10 Mon Apr 28 18:42:35 2003
+++ php4/ext/openssl/openssl.c Tue Apr 29 09:48:05 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.52.2.10 2003/04/28 22:42:35 iliaa Exp $ */
+/* $Id: openssl.c,v 1.52.2.11 2003/04/29 13:48:05 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -3011,7 +3011,7 @@
}
-PHPAPI int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream
TSRMLS_DC)
+PHP_OPENSSL_API int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream
TSRMLS_DC)
{
zval **val = NULL;
char *cnmatch = NULL;
@@ -3099,7 +3099,7 @@
return 0;
}
-PHPAPI SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC)
+PHP_OPENSSL_API SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC)
{
zval **val = NULL;
char *cafile = NULL;
Index: php4/ext/openssl/php_openssl.h
diff -u php4/ext/openssl/php_openssl.h:1.10.8.2 php4/ext/openssl/php_openssl.h:1.10.8.3
--- php4/ext/openssl/php_openssl.h:1.10.8.2 Sat Apr 26 17:34:47 2003
+++ php4/ext/openssl/php_openssl.h Tue Apr 29 09:48:05 2003
@@ -17,10 +17,26 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_openssl.h,v 1.10.8.2 2003/04/26 21:34:47 wez Exp $ */
+/* $Id: php_openssl.h,v 1.10.8.3 2003/04/29 13:48:05 wez Exp $ */
#ifndef PHP_OPENSSL_H
#define PHP_OPENSSL_H
+
+#ifdef PHP_WIN32
+# undef PHP_OPENSSL_API
+# ifdef OPENSSL_EXPORTS
+# define PHP_OPENSSL_API __declspec(dllexport)
+# else
+# define PHP_OPENSSL_API __declspec(dllimport)
+# endif
+#else
+# undef PHP_OPENSSL_API
+# define PHP_OPENSSL_API /* nothing special */
+#endif
+
+
+
+
/* HAVE_OPENSSL would include SSL MySQL stuff */
#if HAVE_OPENSSL_EXT
extern zend_module_entry openssl_module_entry;
@@ -66,8 +82,9 @@
PHP_FUNCTION(openssl_csr_sign);
#include <openssl/ssl.h>
-PHPAPI int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream
TSRMLS_DC);
-PHPAPI SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC);
+PHP_OPENSSL_API int php_openssl_apply_verification_policy(SSL *ssl, X509 *peer, php_stream *stream
TSRMLS_DC);
+PHP_OPENSSL_API SSL *php_SSL_new_from_context(SSL_CTX *ctx, php_stream *stream TSRMLS_DC);
+
#else