summaryrefslogtreecommitdiff
path: root/ext/curl
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-13 14:12:55 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-13 14:12:55 +0200
commit7f6387b59ae1b5d642b0d05afbb14cab07061a9a (patch)
treed09f6f4674163b6a57d8805408877b05294f6931 /ext/curl
parent3f72c77ce47ee0906905b83161d9c1d24e425d89 (diff)
downloadphp-git-7f6387b59ae1b5d642b0d05afbb14cab07061a9a.tar.gz
Trim trailing whitespace in source code files
Diffstat (limited to 'ext/curl')
-rw-r--r--ext/curl/config.m418
-rw-r--r--ext/curl/config.w322
-rw-r--r--ext/curl/package.xml14
-rw-r--r--ext/curl/tests/responder/get.php2
-rw-r--r--ext/curl/tests/server.inc4
5 files changed, 20 insertions, 20 deletions
diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index a7c2238ae8..1ad688f7aa 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id$
+dnl $Id$
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -64,18 +64,18 @@ if test "$PHP_CURL" != "no"; then
fi
PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
-
+
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
if test "$CURL_SSL" = "SSL"; then
AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
-
+
save_CFLAGS="$CFLAGS"
CFLAGS="`$CURL_CONFIG --cflags`"
save_LDFLAGS="$LDFLAGS"
LDFLAGS="`$CURL_CONFIG --libs`"
-
+
AC_PROG_CPP
AC_MSG_CHECKING([for openssl support in libcurl])
AC_TRY_RUN([
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
], [
AC_MSG_RESULT([no])
])
-
+
AC_MSG_CHECKING([for gnutls support in libcurl])
AC_TRY_RUN([
#include <curl/curl.h>
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
int main(int argc, char *argv[])
{
curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-
+
if (data && data->ssl_version && *data->ssl_version) {
const char *ptr = data->ssl_version;
@@ -130,15 +130,15 @@ int main(int argc, char *argv[])
], [
AC_MSG_RESULT([no])
])
-
+
CFLAGS="$save_CFLAGS"
LDFLAGS="$save_LDFLAGS"
else
AC_MSG_RESULT([no])
fi
- PHP_CHECK_LIBRARY(curl,curl_easy_perform,
- [
+ PHP_CHECK_LIBRARY(curl,curl_easy_perform,
+ [
AC_DEFINE(HAVE_CURL,1,[ ])
],[
AC_MSG_ERROR(There is something wrong. Please check config.log for more information.)
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index 112e5ea8f4..814c7ada74 100644
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -19,7 +19,7 @@ if (PHP_CURL != "no") {
SETUP_OPENSSL("curl", PHP_CURL) > 0 &&
CHECK_LIB("winmm.lib", "curl", PHP_CURL) &&
CHECK_LIB("wldap32.lib", "curl", PHP_CURL) &&
- (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) ||
+ (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) ||
(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
!isNaN(ver_num) &&
(ver_num <= parseInt("0x073b00") || ver_num > parseInt("0x073b00") &&
diff --git a/ext/curl/package.xml b/ext/curl/package.xml
index f54abaf872..24f62b1f66 100644
--- a/ext/curl/package.xml
+++ b/ext/curl/package.xml
@@ -12,13 +12,13 @@
</maintainer>
</maintainers>
<description>
-PHP supports libcurl, a library created by Daniel Stenberg,
-that allows you to connect and communicate to many different
-types of servers with many different types of protocols.
-libcurl currently supports the http, https, ftp, gopher,
-telnet, dict, file, and ldap protocols. libcurl also supports
-HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading (this
-can also be done with PHP's ftp extension), HTTP form based
+PHP supports libcurl, a library created by Daniel Stenberg,
+that allows you to connect and communicate to many different
+types of servers with many different types of protocols.
+libcurl currently supports the http, https, ftp, gopher,
+telnet, dict, file, and ldap protocols. libcurl also supports
+HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading (this
+can also be done with PHP's ftp extension), HTTP form based
upload, proxies, cookies, and user+password authentication.
</description>
<license>PHP</license>
diff --git a/ext/curl/tests/responder/get.php b/ext/curl/tests/responder/get.php
index 60aafc03d4..f9269745f6 100644
--- a/ext/curl/tests/responder/get.php
+++ b/ext/curl/tests/responder/get.php
@@ -21,7 +21,7 @@
echo $_COOKIE['foo'];
break;
case 'encoding':
- echo $_SERVER['HTTP_ACCEPT_ENCODING'];
+ echo $_SERVER['HTTP_ACCEPT_ENCODING'];
break;
case 'contenttype':
header('Content-Type: text/plain;charset=utf-8');
diff --git a/ext/curl/tests/server.inc b/ext/curl/tests/server.inc
index 27f0cbbc84..124e0f898c 100644
--- a/ext/curl/tests/server.inc
+++ b/ext/curl/tests/server.inc
@@ -8,7 +8,7 @@ function curl_cli_server_start() {
if(getenv('PHP_CURL_HTTP_REMOTE_SERVER')) {
return getenv('PHP_CURL_HTTP_REMOTE_SERVER');
}
-
+
$php_executable = getenv('TEST_PHP_EXECUTABLE');
$doc_root = __DIR__;
$router = "responder/get.php";
@@ -36,7 +36,7 @@ function curl_cli_server_start() {
$handle = proc_open($cmd, $descriptorspec, $pipes, $doc_root);
}
-
+
// note: even when server prints 'Listening on localhost:8964...Press Ctrl-C to quit.'
// it might not be listening yet...need to wait until fsockopen() call returns
$error = "Unable to connect to server\n";