rasmus          Mon Oct  7 20:14:02 2002 EDT

  Modified files:              
    /php4/sapi/apache   php_apache_http.h 
  Log:
  zlib.h being included before ssl.h needs to be handled here too
  
  
Index: php4/sapi/apache/php_apache_http.h
diff -u php4/sapi/apache/php_apache_http.h:1.3 php4/sapi/apache/php_apache_http.h:1.4
--- php4/sapi/apache/php_apache_http.h:1.3      Fri May 31 00:47:19 2002
+++ php4/sapi/apache/php_apache_http.h  Mon Oct  7 20:13:56 2002
@@ -11,6 +11,13 @@
 
 #include "zend.h"
 #include "php_regex.h"
+#include "php_compat.h"
+
+#if HAVE_OPENSSL_EXT
+/* zlib typedefs free_func which causes problems if the SSL includes happen
+ * after zlib.h is included */
+# include <openssl/ssl.h>
+#endif
 
 #include "httpd.h"
 #include "http_config.h"



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

Reply via email to