From 0db5048d6a701ba45d1e39dc4cbfbfc99d670611 Mon Sep 17 00:00:00 2001 From: foobar Date: Fri, 27 Jun 2003 16:42:51 +0000 Subject: [PATCH] MFH --- ext/ftp/ftp.c | 18 +++++++++--------- ext/ftp/ftp.h | 4 ++-- ext/ftp/php_ftp.c | 6 +++--- ext/ftp/php_ftp.h | 2 +- ext/openssl/php_openssl.h | 2 +- ext/standard/basic_functions.c | 4 ++-- ext/standard/fsock.c | 4 ++-- ext/standard/ftp_fopen_wrapper.c | 6 +++--- ext/standard/http_fopen_wrapper.c | 2 +- main/internal_functions.c.in | 2 +- main/network.c | 18 +++++++++--------- main/php_network.h | 6 +++--- sapi/apache/php_apache_http.h | 2 +- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index 34afd72e73..c3bf8a4464 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -165,7 +165,7 @@ ftp_close(ftpbuf_t *ftp) if (ftp->data) data_close(ftp, ftp->data); if (ftp->fd != -1) { -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (ftp->ssl_active) { SSL_shutdown(ftp->ssl_handle); } @@ -224,13 +224,13 @@ ftp_quit(ftpbuf_t *ftp) int ftp_login(ftpbuf_t *ftp, const char *user, const char *pass TSRMLS_DC) { -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT SSL_CTX *ctx = NULL; #endif if (ftp == NULL) return 0; -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (ftp->use_ssl && !ftp->ssl_active) { if (!ftp_putcmd(ftp, "AUTH", "TLS")) return 0; @@ -1089,7 +1089,7 @@ my_send(ftpbuf_t *ftp, int s, void *buf, size_t len) return -1; } -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (ftp->use_ssl && ftp->fd == s && ftp->ssl_active) { sent = SSL_write(ftp->ssl_handle, buf, size); } else @@ -1133,7 +1133,7 @@ my_recv(ftpbuf_t *ftp, int s, void *buf, size_t len) return -1; } -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (ftp->use_ssl && ftp->fd == s && ftp->ssl_active) { nr_bytes = SSL_read(ftp->ssl_handle, buf, len); } else @@ -1354,7 +1354,7 @@ data_accept(databuf_t *data, ftpbuf_t *ftp) php_sockaddr_storage addr; socklen_t size; -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT SSL_CTX *ctx; TSRMLS_FETCH(); #endif @@ -1373,7 +1373,7 @@ data_accept(databuf_t *data, ftpbuf_t *ftp) } data_accepted: -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT /* now enable ssl if we need to */ if (ftp->use_ssl && ftp->use_ssl_for_data) { @@ -1420,7 +1420,7 @@ data_close(ftpbuf_t *ftp, databuf_t *data) if (data == NULL) return NULL; if (data->listener != -1) { -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (data->ssl_active) { SSL_shutdown(data->ssl_handle); data->ssl_active = 0; @@ -1429,7 +1429,7 @@ data_close(ftpbuf_t *ftp, databuf_t *data) closesocket(data->listener); } if (data->fd != -1) { -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (data->ssl_active) { SSL_shutdown(data->ssl_handle); data->ssl_active = 0; diff --git a/ext/ftp/ftp.h b/ext/ftp/ftp.h index 43d7e98827..7ce9f803f4 100644 --- a/ext/ftp/ftp.h +++ b/ext/ftp/ftp.h @@ -49,7 +49,7 @@ typedef struct databuf int fd; /* data connection */ ftptype_t type; /* transfer type */ char buf[FTP_BUFSIZE]; /* data buffer */ -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT SSL *ssl_handle; /* ssl handle */ int ssl_active; /* flag if ssl is active or not */ #endif @@ -78,7 +78,7 @@ typedef struct ftpbuf int lastch; /* last char of previous call */ int direction; /* recv = 0 / send = 1 */ int closestream;/* close or not close stream */ -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT int use_ssl; /* enable(1) or disable(0) ssl */ int use_ssl_for_data; /* en/disable ssl for the dataconnection */ int old_ssl; /* old mode = forced data encryption */ diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index b125fa98db..d0b06dba9b 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -48,7 +48,7 @@ static int le_ftpbuf; function_entry php_ftp_functions[] = { PHP_FE(ftp_connect, NULL) -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT PHP_FE(ftp_ssl_connect, NULL) #endif PHP_FE(ftp_login, NULL) @@ -166,7 +166,7 @@ PHP_FUNCTION(ftp_connect) /* autoseek for resuming */ ftp->autoseek = FTP_DEFAULT_AUTOSEEK; -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT /* disable ssl */ ftp->use_ssl = 0; #endif @@ -175,7 +175,7 @@ PHP_FUNCTION(ftp_connect) } /* }}} */ -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT /* {{{ proto resource ftp_ssl_connect(string host [, int port [, int timeout)]]) Opens a FTP-SSL stream */ PHP_FUNCTION(ftp_ssl_connect) diff --git a/ext/ftp/php_ftp.h b/ext/ftp/php_ftp.h index 10c87b7b0a..31d2794ac9 100644 --- a/ext/ftp/php_ftp.h +++ b/ext/ftp/php_ftp.h @@ -35,7 +35,7 @@ PHP_MINIT_FUNCTION(ftp); PHP_MINFO_FUNCTION(ftp); PHP_FUNCTION(ftp_connect); -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT PHP_FUNCTION(ftp_ssl_connect); #endif PHP_FUNCTION(ftp_login); diff --git a/ext/openssl/php_openssl.h b/ext/openssl/php_openssl.h index 147fb9b6b8..be3cf41166 100644 --- a/ext/openssl/php_openssl.h +++ b/ext/openssl/php_openssl.h @@ -38,7 +38,7 @@ /* HAVE_OPENSSL would include SSL MySQL stuff */ -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT extern zend_module_entry openssl_module_entry; #define phpext_openssl_ptr &openssl_module_entry diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 141922ad98..ba56dce306 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1055,7 +1055,7 @@ PHP_MINIT_FUNCTION(basic) #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 +# ifdef 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 @@ -1077,7 +1077,7 @@ PHP_MSHUTDOWN_FUNCTION(basic) #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 +# ifdef HAVE_OPENSSL_EXT php_unregister_url_stream_wrapper("https" TSRMLS_CC); php_unregister_url_stream_wrapper("ftps" TSRMLS_CC); # endif diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c index cbae0aee51..b8dadf5c77 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -217,7 +217,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent) break; } } -#if !HAVE_OPENSSL_EXT +#ifndef HAVE_OPENSSL_EXT if (ssl_flags != php_ssl_none) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "no SSL support in this build"); } @@ -234,7 +234,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent) php_stream_context_set(stream, context); } -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (stream && ssl_flags != php_ssl_none) { int ssl_ret = FAILURE; switch(ssl_flags) { diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index b30d763f3e..0dc91752e5 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -143,7 +143,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch char *scratch; int result; int i, use_ssl; -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT int use_ssl_on_data=0; php_stream *reuseid=NULL; #endif @@ -183,7 +183,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch goto errexit; } -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (use_ssl) { /* send the AUTH TLS request name */ @@ -434,7 +434,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch php_stream_context_set(datastream, context); php_stream_notify_progress_init(context, 0, file_size); -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (use_ssl_on_data && php_stream_sock_ssl_activate_with_method(datastream, 1, SSLv23_method(), reuseid TSRMLS_CC) == FAILURE) { php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "Unable to activate SSL mode"); php_stream_close(datastream); diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 0a4d7f5682..75ca9c60ff 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -145,7 +145,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, php_stream_notify_info(context, PHP_STREAM_NOTIFY_CONNECT, NULL, 0); -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (use_ssl) { if (context) { diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in index 4903d6c4bb..280218409b 100644 --- a/main/internal_functions.c.in +++ b/main/internal_functions.c.in @@ -29,7 +29,7 @@ #include #include -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT /* zlib typedefs free_func which causes problems if the SSL includes happen * after zlib.h is included */ # include diff --git a/main/network.c b/main/network.c index 2bc20ef826..243851171f 100644 --- a/main/network.c +++ b/main/network.c @@ -98,7 +98,7 @@ int inet_aton(const char *, struct in_addr *); #include "ext/standard/file.h" -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT static int handle_ssl_error(php_stream *stream, int nr_bytes TSRMLS_DC); #endif @@ -700,7 +700,7 @@ PHPAPI php_stream *_php_stream_sock_open_unix(const char *path, int pathlen, con #endif } -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method, php_stream *session_stream TSRMLS_DC) { php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; @@ -813,7 +813,7 @@ PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC) return ret; } -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT static void php_ERR_error_string_n(int code, char *buf, size_t size) { @@ -914,7 +914,7 @@ static size_t php_sockop_write(php_stream *stream, const char *buf, size_t count php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; int didwrite; -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (sock->ssl_active) { int retry = 1; @@ -997,7 +997,7 @@ static size_t php_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS php_netstream_data_t *sock = (php_netstream_data_t*)stream->abstract; int nr_bytes = 0; -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (sock->ssl_active) { int retry = 1; @@ -1057,7 +1057,7 @@ static int php_sockop_close(php_stream *stream, int close_handle TSRMLS_DC) #endif if (close_handle) { -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (sock->ssl_active) { SSL_shutdown(sock->ssl_handle); sock->ssl_active = 0; @@ -1156,7 +1156,7 @@ int _php_network_is_stream_alive(php_stream *stream) if (select(fd+1, &rfds, NULL, NULL, &tv) > 0) { if (FD_ISSET(fd, &rfds)) { -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (sock->ssl_active) { int n; @@ -1205,7 +1205,7 @@ static int php_sockop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) switch(castas) { case PHP_STREAM_AS_STDIO: -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (sock->ssl_active) { return FAILURE; } @@ -1220,7 +1220,7 @@ static int php_sockop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) return SUCCESS; case PHP_STREAM_AS_FD: case PHP_STREAM_AS_SOCKETD: -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT if (sock->ssl_active) { return FAILURE; } diff --git a/main/php_network.h b/main/php_network.h index 0eb09cf408..65646ab50a 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -74,7 +74,7 @@ PHPAPI char *php_socket_strerror(long err, char *buf, size_t bufsize); #include #endif -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT #include #endif @@ -124,7 +124,7 @@ struct _php_netstream_data_t { char is_blocked; struct timeval timeout; char timeout_event; -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT /* openssl specific bits here */ SSL *ssl_handle; int ssl_active; @@ -158,7 +158,7 @@ PHPAPI php_stream *_php_stream_sock_open_unix(const char *path, int pathlen, con /* private API; don't use in extensions */ int _php_network_is_stream_alive(php_stream *stream); -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT PHPAPI int php_stream_sock_ssl_activate_with_method(php_stream *stream, int activate, SSL_METHOD *method, php_stream *session_stream TSRMLS_DC); #define php_stream_sock_ssl_activate(stream, activate) php_stream_sock_ssl_activate_with_method((stream), (activate), SSLv23_client_method(), NULL TSRMLS_CC) diff --git a/sapi/apache/php_apache_http.h b/sapi/apache/php_apache_http.h index f3909efb77..73b157a643 100644 --- a/sapi/apache/php_apache_http.h +++ b/sapi/apache/php_apache_http.h @@ -13,7 +13,7 @@ #include "php_regex.h" #include "php_compat.h" -#if HAVE_OPENSSL_EXT +#ifdef HAVE_OPENSSL_EXT /* zlib typedefs free_func which causes problems if the SSL includes happen * after zlib.h is included */ # include -- 2.40.0