From 74b7ddc2c14b51dd364da1ecf534c7cbef5d54da Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 15 Feb 2020 02:38:52 +0300 Subject: Release version 7.67.0+6 Drop copyright notice from source code Make curl tests to follow location for 3xx HTTP responses --- curl/build/bootstrap.build | 1 - curl/build/export.build | 1 - curl/build/root.build | 1 - curl/buildfile | 1 - curl/curl/buildfile | 1 - curl/manifest | 2 +- curl/tests/build/bootstrap.build | 1 - curl/tests/build/root.build | 1 - curl/tests/buildfile | 1 - curl/tests/http.testscript | 3 +-- curl/tests/https.testscript | 3 +-- libcurl/build/bootstrap.build | 1 - libcurl/build/export.build | 1 - libcurl/build/root.build | 1 - libcurl/buildfile | 1 - libcurl/libcurl/assert.c | 1 - libcurl/libcurl/buildfile | 1 - libcurl/libcurl/curl_config.h | 1 - libcurl/manifest | 2 +- libcurl/tests/basic/buildfile | 1 - libcurl/tests/basic/driver.c | 4 ++-- libcurl/tests/basic/testscript | 1 - libcurl/tests/build/bootstrap.build | 1 - libcurl/tests/build/root.build | 1 - libcurl/tests/buildfile | 1 - 25 files changed, 6 insertions(+), 28 deletions(-) diff --git a/curl/build/bootstrap.build b/curl/build/bootstrap.build index 9800e74..194c20d 100644 --- a/curl/build/bootstrap.build +++ b/curl/build/bootstrap.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file project = curl diff --git a/curl/build/export.build b/curl/build/export.build index 406aafa..dd03416 100644 --- a/curl/build/export.build +++ b/curl/build/export.build @@ -1,5 +1,4 @@ # file : build/export.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file $out_root/ diff --git a/curl/build/root.build b/curl/build/root.build index c615f65..4c90074 100644 --- a/curl/build/root.build +++ b/curl/build/root.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file using c diff --git a/curl/buildfile b/curl/buildfile index 540178e..fbdfe23 100644 --- a/curl/buildfile +++ b/curl/buildfile @@ -1,5 +1,4 @@ # file : buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file ./: {*/ -build/} doc{COPYING INSTALL README} manifest diff --git a/curl/curl/buildfile b/curl/curl/buildfile index f6c40c4..7b88ae7 100644 --- a/curl/curl/buildfile +++ b/curl/curl/buildfile @@ -1,5 +1,4 @@ # file : curl/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file import libs = libcurl%lib{curl} diff --git a/curl/manifest b/curl/manifest index 2b67e55..91225e1 100644 --- a/curl/manifest +++ b/curl/manifest @@ -1,6 +1,6 @@ : 1 name: curl -version: 7.67.0+5 +version: 7.67.0+6 summary: Command line tool for transferring data with URLs license: cURL ; MIT/X derivate license. topics: HTTP, FTP, URL, data transfer diff --git a/curl/tests/build/bootstrap.build b/curl/tests/build/bootstrap.build index d8bbf2c..b1c5f94 100644 --- a/curl/tests/build/bootstrap.build +++ b/curl/tests/build/bootstrap.build @@ -1,5 +1,4 @@ # file : tests/build/bootstrap.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file project = # Unnamed tests subproject. diff --git a/curl/tests/build/root.build b/curl/tests/build/root.build index 2ea18e0..b75fafe 100644 --- a/curl/tests/build/root.build +++ b/curl/tests/build/root.build @@ -1,5 +1,4 @@ # file : tests/build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file # We need to configure C module to obtain the target information (see below). diff --git a/curl/tests/buildfile b/curl/tests/buildfile index 3ad4988..1c3ad5d 100644 --- a/curl/tests/buildfile +++ b/curl/tests/buildfile @@ -1,5 +1,4 @@ # file : tests/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file ./: testscript{*} file{empty.pem} $curl diff --git a/curl/tests/http.testscript b/curl/tests/http.testscript index 13ec3ae..c73bd23 100644 --- a/curl/tests/http.testscript +++ b/curl/tests/http.testscript @@ -1,9 +1,8 @@ # file : tests/http.testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file : basic : -$* --fail -sS 'http://www.example.com' >>~%EOO% +$* --fail --location -sS 'http://www.example.com' >>~%EOO% %.+ EOO diff --git a/curl/tests/https.testscript b/curl/tests/https.testscript index 1dee6c0..eb4aea1 100644 --- a/curl/tests/https.testscript +++ b/curl/tests/https.testscript @@ -1,11 +1,10 @@ # file : tests/https.testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file : default : { - $* --fail -sS 'https://www.example.com' >>~%EOO% + $* --fail --location -sS 'https://www.example.com' >>~%EOO% %.+ EOO } diff --git a/libcurl/build/bootstrap.build b/libcurl/build/bootstrap.build index 23d898a..f608fd0 100644 --- a/libcurl/build/bootstrap.build +++ b/libcurl/build/bootstrap.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file project = libcurl diff --git a/libcurl/build/export.build b/libcurl/build/export.build index 2a2b403..77bc612 100644 --- a/libcurl/build/export.build +++ b/libcurl/build/export.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file $out_root/ diff --git a/libcurl/build/root.build b/libcurl/build/root.build index 3199ffa..042c9d3 100644 --- a/libcurl/build/root.build +++ b/libcurl/build/root.build @@ -1,5 +1,4 @@ # file : build/root.build -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file using in diff --git a/libcurl/buildfile b/libcurl/buildfile index 04c29b8..da9bfb2 100644 --- a/libcurl/buildfile +++ b/libcurl/buildfile @@ -1,5 +1,4 @@ # file : buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file # ./: {*/ -build/} doc{COPYING INSTALL README} manifest diff --git a/libcurl/libcurl/assert.c b/libcurl/libcurl/assert.c index 60eb1e5..e5ceeb6 100644 --- a/libcurl/libcurl/assert.c +++ b/libcurl/libcurl/assert.c @@ -1,5 +1,4 @@ /* file : libcurl/assert.c -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : cURL License; see accompanying COPYING file */ diff --git a/libcurl/libcurl/buildfile b/libcurl/libcurl/buildfile index 652a25e..583aaf9 100644 --- a/libcurl/libcurl/buildfile +++ b/libcurl/libcurl/buildfile @@ -1,5 +1,4 @@ # file : libcurl/buildfile -# copyright : Copyright (c) 2018-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file # Version script. diff --git a/libcurl/libcurl/curl_config.h b/libcurl/libcurl/curl_config.h index 524513c..7fb10a7 100644 --- a/libcurl/libcurl/curl_config.h +++ b/libcurl/libcurl/curl_config.h @@ -1,5 +1,4 @@ /* file : libcurl/curl_config.h -*- C -*- - * copyright : Copyright (c) 2016-2019 Code Synthesis Ltd * license : cURL License; see accompanying COPYING file */ diff --git a/libcurl/manifest b/libcurl/manifest index b80d0d8..44145c1 100644 --- a/libcurl/manifest +++ b/libcurl/manifest @@ -1,6 +1,6 @@ : 1 name: libcurl -version: 7.67.0+5 +version: 7.67.0+6 project: curl summary: C library for transferring data with URLs license: cURL ; MIT/X derivate license. diff --git a/libcurl/tests/basic/buildfile b/libcurl/tests/basic/buildfile index a01f5f2..9dd8436 100644 --- a/libcurl/tests/basic/buildfile +++ b/libcurl/tests/basic/buildfile @@ -1,5 +1,4 @@ # file : tests/basic/buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : cURL License; see accompanying COPYING file import libs = libcurl%lib{curl} diff --git a/libcurl/tests/basic/driver.c b/libcurl/tests/basic/driver.c index 4df9471..f784a88 100644 --- a/libcurl/tests/basic/driver.c +++ b/libcurl/tests/basic/driver.c @@ -1,5 +1,4 @@ /* file : tests/basic/driver.c - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC * license : cURL License; see accompanying COPYING file */ #include @@ -27,6 +26,7 @@ main (int argc, char* argv[]) if (curl != NULL) { curl_easy_setopt (curl, CURLOPT_URL, url); + curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L); CURLcode cr = curl_easy_perform (curl); @@ -37,7 +37,7 @@ main (int argc, char* argv[]) if (cr == CURLE_OK) { - if (status < 400) + if (status == 200) r = 0; else fprintf (stderr, "HTTP error: status code %ld\n", status); diff --git a/libcurl/tests/basic/testscript b/libcurl/tests/basic/testscript index 90baed2..054eead 100644 --- a/libcurl/tests/basic/testscript +++ b/libcurl/tests/basic/testscript @@ -1,5 +1,4 @@ # file : tests/basic/testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file : http diff --git a/libcurl/tests/build/bootstrap.build b/libcurl/tests/build/bootstrap.build index d2722f1..a776805 100644 --- a/libcurl/tests/build/bootstrap.build +++ b/libcurl/tests/build/bootstrap.build @@ -1,5 +1,4 @@ # file : tests/build/bootstrap.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file project = # Unnamed subproject. diff --git a/libcurl/tests/build/root.build b/libcurl/tests/build/root.build index a5f8fbe..60fd379 100644 --- a/libcurl/tests/build/root.build +++ b/libcurl/tests/build/root.build @@ -1,5 +1,4 @@ # file : tests/build/root.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file using c diff --git a/libcurl/tests/buildfile b/libcurl/tests/buildfile index dcd3e02..8b91020 100644 --- a/libcurl/tests/buildfile +++ b/libcurl/tests/buildfile @@ -1,5 +1,4 @@ # file : tests/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : cURL License; see accompanying COPYING file ./: {*/ -build/} -- cgit v1.1