wez Thu Feb 27 13:16:35 2003 EDT
Modified files:
/php4/ext/openssl openssl.c
/php4/ext/standard basic_functions.c file.c ftp_fopen_wrapper.c
http_fopen_wrapper.c php_fopen_wrappers.h
Log:
- Move https:// and ftps:// wrapper registration into the openssl module.
- Expose the http:// and ftp:// wrappers as PHPAPI
- Remove unused variables
Index: php4/ext/openssl/openssl.c
diff -u php4/ext/openssl/openssl.c:1.66 php4/ext/openssl/openssl.c:1.67
--- php4/ext/openssl/openssl.c:1.66 Thu Feb 27 12:43:36 2003
+++ php4/ext/openssl/openssl.c Thu Feb 27 13:16:34 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.66 2003/02/27 17:43:36 wez Exp $ */
+/* $Id: openssl.c,v 1.67 2003/02/27 18:16:34 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -30,6 +30,7 @@
/* PHP Includes */
#include "ext/standard/file.h"
#include "ext/standard/info.h"
+#include "ext/standard/php_fopen_wrappers.h"
/* OpenSSL includes */
#include <openssl/evp.h>
@@ -614,6 +615,9 @@
/* override the default tcp socket provider */
php_stream_xport_register("tcp", php_openssl_ssl_socket_factory TSRMLS_CC);
+
+ php_register_url_stream_wrapper("https", &php_stream_http_wrapper TSRMLS_CC);
+ php_register_url_stream_wrapper("ftps", &php_stream_ftp_wrapper TSRMLS_CC);
return SUCCESS;
}
@@ -635,6 +639,9 @@
PHP_MSHUTDOWN_FUNCTION(openssl)
{
EVP_cleanup();
+
+ php_unregister_url_stream_wrapper("https" TSRMLS_CC);
+ php_unregister_url_stream_wrapper("ftps" TSRMLS_CC);
php_stream_xport_unregister("ssl" TSRMLS_CC);
php_stream_xport_unregister("tls" TSRMLS_CC);
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.590
php4/ext/standard/basic_functions.c:1.591
--- php4/ext/standard/basic_functions.c:1.590 Thu Feb 27 12:43:37 2003
+++ php4/ext/standard/basic_functions.c Thu Feb 27 13:16:34 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.590 2003/02/27 17:43:37 wez Exp $ */
+/* $Id: basic_functions.c,v 1.591 2003/02/27 18:16:34 wez Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1107,10 +1107,6 @@
#ifndef PHP_CURL_URL_WRAPPERS
php_register_url_stream_wrapper("http", &php_stream_http_wrapper TSRMLS_CC);
php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper TSRMLS_CC);
-# if HAVE_OPENSSL_EXT
- php_register_url_stream_wrapper("https", &php_stream_http_wrapper TSRMLS_CC);
- php_register_url_stream_wrapper("ftps", &php_stream_ftp_wrapper TSRMLS_CC);
-# endif
#endif
#if HAVE_RES_SEARCH && !(defined(__BEOS__)||defined(PHP_WIN32) || defined(NETWARE))
@@ -1135,10 +1131,6 @@
#ifndef PHP_CURL_URL_WRAPPERS
php_unregister_url_stream_wrapper("http" TSRMLS_CC);
php_unregister_url_stream_wrapper("ftp" TSRMLS_CC);
-# if HAVE_OPENSSL_EXT
- php_unregister_url_stream_wrapper("https" TSRMLS_CC);
- php_unregister_url_stream_wrapper("ftps" TSRMLS_CC);
-# endif
#endif
UNREGISTER_INI_ENTRIES();
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.316 php4/ext/standard/file.c:1.317
--- php4/ext/standard/file.c:1.316 Thu Feb 27 12:43:37 2003
+++ php4/ext/standard/file.c Thu Feb 27 13:16:34 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.316 2003/02/27 17:43:37 wez Exp $ */
+/* $Id: file.c,v 1.317 2003/02/27 18:16:34 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -2246,8 +2246,6 @@
PHP_NAMED_FUNCTION(php_if_ftruncate)
{
zval **fp , **size;
- short int ret;
- int fd;
php_stream *stream;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &fp, &size) == FAILURE) {
Index: php4/ext/standard/ftp_fopen_wrapper.c
diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.46
php4/ext/standard/ftp_fopen_wrapper.c:1.47
--- php4/ext/standard/ftp_fopen_wrapper.c:1.46 Thu Feb 27 12:43:37 2003
+++ php4/ext/standard/ftp_fopen_wrapper.c Thu Feb 27 13:16:34 2003
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.46 2003/02/27 17:43:37 wez Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.47 2003/02/27 18:16:34 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -123,7 +123,7 @@
"FTP"
};
-php_stream_wrapper php_stream_ftp_wrapper = {
+PHPAPI php_stream_wrapper php_stream_ftp_wrapper = {
&ftp_stream_wops,
NULL,
1 /* is_url */
Index: php4/ext/standard/http_fopen_wrapper.c
diff -u php4/ext/standard/http_fopen_wrapper.c:1.67
php4/ext/standard/http_fopen_wrapper.c:1.68
--- php4/ext/standard/http_fopen_wrapper.c:1.67 Thu Feb 27 12:43:37 2003
+++ php4/ext/standard/http_fopen_wrapper.c Thu Feb 27 13:16:34 2003
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.67 2003/02/27 17:43:37 wez Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.68 2003/02/27 18:16:34 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -455,7 +455,7 @@
"HTTP"
};
-php_stream_wrapper php_stream_http_wrapper = {
+PHPAPI php_stream_wrapper php_stream_http_wrapper = {
&http_stream_wops,
NULL,
1 /* is_url */
Index: php4/ext/standard/php_fopen_wrappers.h
diff -u php4/ext/standard/php_fopen_wrappers.h:1.15
php4/ext/standard/php_fopen_wrappers.h:1.16
--- php4/ext/standard/php_fopen_wrappers.h:1.15 Tue Dec 31 11:07:51 2002
+++ php4/ext/standard/php_fopen_wrappers.h Thu Feb 27 13:16:34 2003
@@ -18,15 +18,15 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fopen_wrappers.h,v 1.15 2002/12/31 16:07:51 sebastian Exp $ */
+/* $Id: php_fopen_wrappers.h,v 1.16 2003/02/27 18:16:34 wez Exp $ */
#ifndef PHP_FOPEN_WRAPPERS_H
#define PHP_FOPEN_WRAPPERS_H
php_stream *php_stream_url_wrap_http(php_stream_wrapper *wrapper, char *path, char
*mode, int options, char **opened_path, php_stream_context *context STREAMS_DC
TSRMLS_DC);
php_stream *php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, char
*mode, int options, char **opened_path, php_stream_context *context STREAMS_DC
TSRMLS_DC);
-extern php_stream_wrapper php_stream_http_wrapper;
-extern php_stream_wrapper php_stream_ftp_wrapper;
+PHPAPI php_stream_wrapper php_stream_http_wrapper;
+PHPAPI php_stream_wrapper php_stream_ftp_wrapper;
extern php_stream_wrapper php_stream_php_wrapper;
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
