[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ext/openssl/ openssl.c

[Guenter Knauf]

guenter  Tue, 03 Nov 2009 18:24:57 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=290180

Log:
added timezone define for NetWare.

Changed paths:
U   php/php-src/branches/PHP_5_2/ext/openssl/openssl.c

Modified: php/php-src/branches/PHP_5_2/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_2/ext/openssl/openssl.c  2009-11-03 18:03:02 UTC 
(rev 290179)
+++ php/php-src/branches/PHP_5_2/ext/openssl/openssl.c  2009-11-03 18:24:57 UTC 
(rev 290180)
@@ -49,6 +49,10 @@
 /* Common */
 #include time.h

+#ifdef NETWARE
+#define timezone _timezone /* timezone is called _timezone in LibC */
+#endif
+
 #define DEFAULT_KEY_LENGTH 512
 #define MIN_KEY_LENGTH 384


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/openssl/openssl.c branches/PHP_5_3/ext/openssl/openssl.c trunk/ext/openssl/openssl.c

[Jani Taskinen]

jani Thu, 30 Jul 2009 11:32:08 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=286551

Log:
- Fixed compile failure with older openssl libs ( 0.9.8), fixes bug #49012

Bug: http://bugs.php.net/49012 (Open) Spurious fatal error on require() 
statement 
  
Changed paths:
U   php/php-src/branches/PHP_5_2/ext/openssl/openssl.c
U   php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
U   php/php-src/trunk/ext/openssl/openssl.c

Modified: php/php-src/branches/PHP_5_2/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_2/ext/openssl/openssl.c  2009-07-30 10:56:29 UTC 
(rev 286550)
+++ php/php-src/branches/PHP_5_2/ext/openssl/openssl.c  2009-07-30 11:32:08 UTC 
(rev 286551)
@@ -870,7 +870,11 @@
if (in == NULL) {
return NULL;
}
+#ifdef TYPEDEF_D2I_OF
cert = (X509 *) PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
+#else
+   cert = (X509 *) PEM_ASN1_read_bio((char *(*)())d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
+#endif
BIO_free(in);
}


Modified: php/php-src/branches/PHP_5_3/ext/openssl/openssl.c
===
--- php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2009-07-30 10:56:29 UTC 
(rev 286550)
+++ php/php-src/branches/PHP_5_3/ext/openssl/openssl.c  2009-07-30 11:32:08 UTC 
(rev 286551)
@@ -1167,7 +1167,11 @@
if (in == NULL) {
return NULL;
}
+#ifdef TYPEDEF_D2I_OF
cert = (X509 *) PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
+#else
+   cert = (X509 *) PEM_ASN1_read_bio((char *(*)())d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
+#endif
BIO_free(in);
}


Modified: php/php-src/trunk/ext/openssl/openssl.c
===
--- php/php-src/trunk/ext/openssl/openssl.c 2009-07-30 10:56:29 UTC (rev 
286550)
+++ php/php-src/trunk/ext/openssl/openssl.c 2009-07-30 11:32:08 UTC (rev 
286551)
@@ -1186,7 +1186,11 @@
if (in == NULL) {
return NULL;
}
+#ifdef TYPEDEF_D2I_OF
cert = (X509 *) PEM_ASN1_read_bio((d2i_of_void *)d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
+#else
+   cert = (X509 *) PEM_ASN1_read_bio((char *(*)())d2i_X509, 
PEM_STRING_X509, in, NULL, NULL, NULL);
+#endif
BIO_free(in);
}
if (cert  makeresource  resourceval) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php