sniper Sat Nov 29 07:07:46 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/openssl config0.m4 php_openssl.h
Log:
- Fixed bug #26447 (--with-openssl=shared causes compile errors).NEWS
Index: php-src/ext/openssl/config0.m4
diff -u php-src/ext/openssl/config0.m4:1.2.2.1 php-src/ext/openssl/config0.m4:1.2.2.2
--- php-src/ext/openssl/config0.m4:1.2.2.1 Wed Aug 27 13:57:30 2003
+++ php-src/ext/openssl/config0.m4 Sat Nov 29 07:07:45 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.2.2.1 2003/08/27 17:57:30 sniper Exp $
+dnl $Id: config0.m4,v 1.2.2.2 2003/11/29 12:07:45 sniper Exp $
dnl
PHP_ARG_WITH(openssl, for OpenSSL support,
@@ -10,7 +10,13 @@
[
PHP_NEW_EXTENSION(openssl, openssl.c, $ext_shared)
PHP_SUBST(OPENSSL_SHARED_LIBADD)
- AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
+
+ if test "$ext_shared" = "yes"; then
+ AC_DEFINE(HAVE_OPENSSL_SHARED_EXT,1,[ ])
+ else
+ AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
+ fi
+
], [
AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more
information.])
])
Index: php-src/ext/openssl/php_openssl.h
diff -u php-src/ext/openssl/php_openssl.h:1.10.8.5
php-src/ext/openssl/php_openssl.h:1.10.8.6
--- php-src/ext/openssl/php_openssl.h:1.10.8.5 Fri Jun 27 12:42:50 2003
+++ php-src/ext/openssl/php_openssl.h Sat Nov 29 07:07:45 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_openssl.h,v 1.10.8.5 2003/06/27 16:42:50 sniper Exp $ */
+/* $Id: php_openssl.h,v 1.10.8.6 2003/11/29 12:07:45 sniper Exp $ */
#ifndef PHP_OPENSSL_H
#define PHP_OPENSSL_H
@@ -34,11 +34,9 @@
# define PHP_OPENSSL_API /* nothing special */
#endif
-
-
-
/* HAVE_OPENSSL would include SSL MySQL stuff */
-#ifdef HAVE_OPENSSL_EXT
+#if defined(HAVE_OPENSSL_EXT) || defined(HAVE_OPENSSL_SHARED_EXT)
+
extern zend_module_entry openssl_module_entry;
#define phpext_openssl_ptr &openssl_module_entry
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
