diff options
| author | Wez Furlong <wez@php.net> | 2003-12-06 16:12:10 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2003-12-06 16:12:10 +0000 |
| commit | bf033aa5a8d210615fcef0e5fdb0f6ac4bd5a258 (patch) | |
| tree | fedc8647b9c478dfdc51d152881ecdb6cebffb8a /ext/ftp/ftp.c | |
| parent | fcdda2e8f8182a38404e3e5db2bb560a9348cd17 (diff) | |
| download | php-git-bf033aa5a8d210615fcef0e5fdb0f6ac4bd5a258.tar.gz | |
Fix ftp build when openssl is built as a shared extension.
Diffstat (limited to 'ext/ftp/ftp.c')
| -rw-r--r-- | ext/ftp/ftp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index d10e079ab9..a1c632acde 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -65,7 +65,7 @@ #include <sys/select.h> #endif -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT #include <openssl/ssl.h> #endif @@ -179,7 +179,7 @@ ftp_close(ftpbuf_t *ftp) data_close(ftp, ftp->data); } if (ftp->fd != -1) { -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT if (ftp->ssl_active) { SSL_shutdown(ftp->ssl_handle); } @@ -241,14 +241,14 @@ ftp_quit(ftpbuf_t *ftp) int ftp_login(ftpbuf_t *ftp, const char *user, const char *pass TSRMLS_DC) { -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT SSL_CTX *ctx = NULL; #endif if (ftp == NULL) { return 0; } -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT if (ftp->use_ssl && !ftp->ssl_active) { if (!ftp_putcmd(ftp, "AUTH", "TLS")) { return 0; @@ -1231,7 +1231,7 @@ my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) return -1; } -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT if (ftp->use_ssl && ftp->fd == s && ftp->ssl_active) { sent = SSL_write(ftp->ssl_handle, buf, size); } else if (ftp->use_ssl && ftp->fd != s && ftp->use_ssl_for_data && ftp->data->ssl_active) { @@ -1239,7 +1239,7 @@ my_send(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) } else { #endif sent = send(s, buf, size, 0); -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT } #endif if (sent == -1) { @@ -1279,7 +1279,7 @@ my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) return -1; } -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT if (ftp->use_ssl && ftp->fd == s && ftp->ssl_active) { nr_bytes = SSL_read(ftp->ssl_handle, buf, len); } else if (ftp->use_ssl && ftp->fd != s && ftp->use_ssl_for_data && ftp->data->ssl_active) { @@ -1287,7 +1287,7 @@ my_recv(ftpbuf_t *ftp, php_socket_t s, void *buf, size_t len) } else { #endif nr_bytes = recv(s, buf, len, 0); -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT } #endif return (nr_bytes); @@ -1507,7 +1507,7 @@ data_accept(databuf_t *data, ftpbuf_t *ftp TSRMLS_DC) php_sockaddr_storage addr; socklen_t size; -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT SSL_CTX *ctx; #endif @@ -1525,7 +1525,7 @@ data_accept(databuf_t *data, ftpbuf_t *ftp TSRMLS_DC) } data_accepted: -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT /* now enable ssl if we need to */ if (ftp->use_ssl && ftp->use_ssl_for_data) { @@ -1573,7 +1573,7 @@ data_close(ftpbuf_t *ftp, databuf_t *data) return NULL; } if (data->listener != -1) { -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT if (data->ssl_active) { SSL_shutdown(data->ssl_handle); data->ssl_active = 0; @@ -1582,7 +1582,7 @@ data_close(ftpbuf_t *ftp, databuf_t *data) closesocket(data->listener); } if (data->fd != -1) { -#ifdef HAVE_OPENSSL_EXT +#if HAVE_OPENSSL_EXT if (data->ssl_active) { SSL_shutdown(data->ssl_handle); data->ssl_active = 0; |