pajoye Mon Jul 6 23:26:23 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/openssl openssl.c
Log:
- #48116, restore 0.x compability, thx config.cache.
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.30&r2=1.98.2.5.2.41.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.41.2.30
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.31
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.30 Mon Jul 6 23:02:18 2009
+++ php-src/ext/openssl/openssl.c Mon Jul 6 23:26:23 2009
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.30 2009/07/06 23:02:18 pajoye Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.31 2009/07/06 23:26:23 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -502,8 +502,13 @@
static char default_ssl_conf_filename[MAXPATHLEN];
struct php_x509_request { /* {{{ */
+#if OPENSSL_VERSION_NUMBER >= 0x10000002L
LHASH_OF(CONF_VALUE) * global_config; /* Global SSL config */
LHASH_OF(CONF_VALUE) * req_config; /* SSL config for this
request */
+#else
+ LHASH * global_config; /* Global SSL config */
+ LHASH * req_config; /* SSL config for this request */
+#endif
const EVP_MD * md_alg;
const EVP_MD * digest;
char * section_name,
@@ -680,7 +685,11 @@
}
/* }}} */
-static inline int php_openssl_config_check_syntax(const char * section_label,
const char * config_filename, const char * section, LHASH_OF(CONF_VALUE) *
config TSRMLS_DC) /* {{{ */
+#if OPENSSL_VERSION_NUMBER >= 0x10000002L
+static inline int php_openssl_config_check_syntax(const char * section_label,
const char * config_filename, const char * section, LHASH_OF(CONF_VALUE) *
config TSRMLS_DC) /* {{{ */
+#else
+static inline int php_openssl_config_check_syntax(const char * section_label,
const char * config_filename, const char * section, LHASH * config TSRMLS_DC)
/* {{{ */
+#endif
{
X509V3_CTX ctx;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
