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

Revision: http://svn.php.net/viewvc?view=revision&revision=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

Reply via email to