- relicense with a BSD style license

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 3e8ec02b187f350506a8cda243009795922508c5..55f5e886ef15c4ae7a93ffda1b6a6b99707cb30a 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -47,12 +44,8 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
-static zend_bool http_support_ssl;
-
 PHP_MINIT_FUNCTION(http_support)
 {
-       http_support_ssl = http_request_supports_ssl();
-       
        HTTP_LONG_CONSTANT("HTTP_SUPPORT", HTTP_SUPPORT);
        HTTP_LONG_CONSTANT("HTTP_SUPPORT_REQUESTS", HTTP_SUPPORT_REQUESTS);
        HTTP_LONG_CONSTANT("HTTP_SUPPORT_MAGICMIME", HTTP_SUPPORT_MAGICMIME);
@@ -69,9 +62,9 @@ PHP_HTTP_API long _http_support(long feature)
        
 #ifdef HTTP_HAVE_CURL
        support |= HTTP_SUPPORT_REQUESTS;
-       if (http_support_ssl) {
-               support |= HTTP_SUPPORT_SSLREQUESTS;
-       }
+#      ifdef HTTP_HAVE_SSL
+       support |= HTTP_SUPPORT_SSLREQUESTS;
+#      endif
 #endif
 #ifdef HTTP_HAVE_MHASH
        support |= HTTP_SUPPORT_MHASHETAGS;