File tree Expand file tree Collapse file tree 3 files changed +6
-14
lines changed Expand file tree Collapse file tree 3 files changed +6
-14
lines changed Original file line number Diff line number Diff line change @@ -23,8 +23,6 @@ if test "$PHP_CURL" != "no"; then
23
23
esac
24
24
25
25
if test "$CURL_SSL" = yes; then
26
- AC_DEFINE ( [ HAVE_CURL_SSL] , [ 1] , [ Have cURL with SSL support] )
27
-
28
26
save_CFLAGS="$CFLAGS"
29
27
CFLAGS="$CFLAGS $CURL_CFLAGS"
30
28
save_LDFLAGS="$LDFLAGS"
Original file line number Diff line number Diff line change @@ -28,7 +28,6 @@ if (PHP_CURL != "no") {
28
28
) {
29
29
EXTENSION ( "curl" , "interface.c multi.c share.c curl_file.c" ) ;
30
30
AC_DEFINE ( 'HAVE_CURL' , 1 , 'Have cURL library' ) ;
31
- AC_DEFINE ( 'HAVE_CURL_SSL' , 1 , 'Have SSL suppurt in cURL' ) ;
32
31
ADD_FLAG ( "CFLAGS_CURL" , "/D CURL_STATICLIB" ) ;
33
32
// TODO: check for curl_version_info
34
33
} else {
Original file line number Diff line number Diff line change 43
43
#endif
44
44
45
45
/* {{{ cruft for thread safe SSL crypto locks */
46
- #if defined(ZTS ) && defined(HAVE_CURL_SSL )
47
- # ifdef PHP_WIN32
46
+ #if defined(ZTS ) && defined(HAVE_CURL_OPENSSL )
47
+ # if defined( HAVE_OPENSSL_CRYPTO_H )
48
48
# define PHP_CURL_NEED_OPENSSL_TSL
49
49
# include <openssl/crypto.h>
50
- # elif defined(HAVE_CURL_OPENSSL )
51
- # if defined(HAVE_OPENSSL_CRYPTO_H )
52
- # define PHP_CURL_NEED_OPENSSL_TSL
53
- # include <openssl/crypto.h>
54
- # else
55
- # warning \
50
+ # else
51
+ # warning \
56
52
"libcurl was compiled with OpenSSL support, but configure could not find " \
57
53
"openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \
58
54
"cause random crashes on SSL requests"
59
- # endif
60
- # endif /* HAVE_CURL_OPENSSL */
61
- #endif /* ZTS && HAVE_CURL_SSL */
55
+ # endif
56
+ #endif /* ZTS && HAVE_CURL_OPENSSL */
62
57
/* }}} */
63
58
64
59
#define SMART_STR_PREALLOC 4096
You can’t perform that action at this time.
0 commit comments