diff options
author | ng0 <ng0@n0.is> | 2019-01-12 21:19:50 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-01-12 21:19:50 +0000 |
commit | 947fa3b58d652d0a84bd20bcc45ed21267b3ee52 (patch) | |
tree | 173cf355b53bba20ac6622104ab4042cb2858183 /packages | |
parent | 5b22ac2fcff3090a1acc41647936b8fbc3d57b13 (diff) | |
parent | 4258dc02d86e7e4de9f795a1af3a0bc6732d4ab5 (diff) | |
download | gnurl-947fa3b58d652d0a84bd20bcc45ed21267b3ee52.tar.gz gnurl-947fa3b58d652d0a84bd20bcc45ed21267b3ee52.tar.bz2 gnurl-947fa3b58d652d0a84bd20bcc45ed21267b3ee52.zip |
Merge tag 'curl-7_63_0'
7.63.0
Diffstat (limited to 'packages')
29 files changed, 201 insertions, 810 deletions
diff --git a/packages/AIX/Makefile.am b/packages/AIX/Makefile.am deleted file mode 100644 index 4b038ed31..000000000 --- a/packages/AIX/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = RPM - -EXTRA_DIST = Makefile.am diff --git a/packages/AIX/RPM/.gitignore b/packages/AIX/RPM/.gitignore deleted file mode 100644 index cf17733e8..000000000 --- a/packages/AIX/RPM/.gitignore +++ /dev/null @@ -1 +0,0 @@ -curl.spec diff --git a/packages/AIX/RPM/Makefile.am b/packages/AIX/RPM/Makefile.am deleted file mode 100644 index 71e854ff8..000000000 --- a/packages/AIX/RPM/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = README curl.spec.in diff --git a/packages/AIX/RPM/README b/packages/AIX/RPM/README deleted file mode 100644 index c2c31bd83..000000000 --- a/packages/AIX/RPM/README +++ /dev/null @@ -1,32 +0,0 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - ( (__| |_| | _ <| |___ - \___|\___/|_| \_\_____| - for AIX Toolbox - -Author: Tor Arntsen - -The spec file in this directory is based on the Linux ssl and non-ssl -curl spec files, plus additions to make it AIX Toolbox compatible. - -The AIX Toolbox setup (installs into /opt/freeware, with symlinks in -/usr/bin,/usr/lib,/usr/include) are based on IBM's aixtoolbox spec -file written by David Clissold <cliss@austin.ibm.com>, see - -https://public.dhe.ibm.com/aix/freeSoftware/aixtoolbox/SPECS/curl-7.61.0-1.spec - -This spec file is designed to be a drop-in replacement for the -old spec file found at the above link. Thus, like the old spec file -this version is also a unified ssl/non-ssl version. To get non-ssl -RPMs just pass --define 'nossl 1' to the command line when building -the RPM, e.g. - -rpm -bb --define 'nossl 1' curl.spec - -Default is to build with ssl support. - -Lastly, the spec file expects the Curl source distribution file to be -in .tar.bz2 format. - -The nifty curl header of this README is a ripoff of the vms/readme file. diff --git a/packages/AIX/RPM/curl.spec.in b/packages/AIX/RPM/curl.spec.in deleted file mode 100644 index 84f98c4f8..000000000 --- a/packages/AIX/RPM/curl.spec.in +++ /dev/null @@ -1,134 +0,0 @@ -# Use --define 'nossl 1' on the command line to disable SSL detection -%{!?nossl:%define SSL 1} -%{?nossl:%define SSL 0} - -%define name curl -%define version @VERSION@ -%define release 1%{!?nossl:ssl} - -%define curlroot %{_builddir}/%{name}-%{version} - -Summary: get a file from a FTP or HTTP server. -Name: %{name} -Version: %{version} -Release: %{release} -License: MIT/X derivate -Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.se> -Group: Applications/Internet -Source: %{name}-%{version}.tar.bz2 -URL: https://curl.haxx.se/ -Provides: curl -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Prefix: %{_prefix} - -%description -curl is a client to get documents/files from servers, using any of the -supported protocols. The command is designed to work without user -interaction or any kind of interactivity. - -curl offers many useful tricks like proxy support, user authentication, -ftp upload, HTTP post, file transfer resume and more. - -%if %{SSL} == 1 -Note: this version is compiled with SSL support. -%else -Note: this version is compiled without SSL support. -%endif - -%package devel -Summary: Development files for the curl library -Group: Development/Libraries -%if %{SSL} == 1 -Requires: openssl >= 0.9.5 -%endif -Requires: curl = %{version} -Provides: curl-devel - -%description devel -libcurl is the core engine of curl; this packages contains all the -libs, headers, and manual pages to develop applications using libcurl. - -%define DEFCC xlc - -%prep -rm -rf %{curlroot} -%setup -q - -%build - -# Use the default compiler for this platform - gcc otherwise -if [[ -z "$CC" ]] -then - if test "X`type %{DEFCC} 2>/dev/null`" != 'X'; then - export CC=%{DEFCC} - else - export CC=gcc - fi -fi - -cd %{curlroot} && (if [ -f configure.in ]; then mv -f configure.in configure.in. -rpm; fi) - -./configure --prefix=%{prefix} \ -%if %{SSL} == 1 - --with-ssl -%else - --without-ssl -%endif - -make - -%install -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -make DESTDIR=%{buildroot} install-strip - -( cd $RPM_BUILD_ROOT # same as %{buildroot} - - for dir in bin include - do - mkdir -p usr/$dir - cd usr/$dir - ln -sf ../..%{prefix}/$dir/* . - cd - - done - - mkdir -p usr/lib - cd usr/lib - ln -sf ../..%{prefix}/lib/* . - cd - -) - -%clean -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} - -%files -%defattr(-,root,root) -%attr(0755,root,root) %{_bindir}/curl -%attr(0644,root,root) %{_mandir}/man1/curl.1* -%attr(0644,root,root) %{_mandir}/man1/mk-ca-bundle.1 -%{_libdir}/libcurl.a -%if %{SSL} == 1 -%{_datadir}/curl/curl-ca-bundle.crt -%endif -%doc CHANGES COPYING README RELEASE-NOTES -%doc docs/BUGS docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/HISTORY -%doc docs/INSTALL docs/KNOWN_BUGS -%doc docs/MANUAL docs/RESOURCES docs/THANKS docs/VERSIONS docs/TODO -%doc docs/TheArtOfHttpScripting -%if %{SSL} == 1 -%doc docs/SSLCERTS -%endif -/usr/bin/curl -/usr/lib/libcurl.a - -%files devel -%defattr(-,root,root) -%attr(0755,root,root) %{_bindir}/curl-config -%attr(0644,root,root) %{_mandir}/man1/curl-config.1* -%attr(0644,root,root) %{_mandir}/man1/mk-ca-bundle.1 -%attr(0644,root,root) %{_mandir}/man3/* -%attr(0644,root,root) %{_includedir}/curl/* -%{_libdir}/libcurl.la -%doc docs/BINDINGS docs/INTERNALS docs/LICENSE-MIXING -/usr/bin/curl-config -/usr/include/gnurl diff --git a/packages/DOS/common.dj b/packages/DOS/common.dj index e069ce68a..c97b216eb 100644 --- a/packages/DOS/common.dj +++ b/packages/DOS/common.dj @@ -96,7 +96,7 @@ CFLAGS = -g -O2 -I. -I$(TOPDIR)/include -I$(TOPDIR)/lib \ -I$(WATT32_ROOT)/inc -Wall -DHAVE_CONFIG_H ifeq ($(USE_SSL),1) - CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -I$(OPENSSL_ROOT) + CFLAGS += -DUSE_OPENSSL -I$(OPENSSL_ROOT) endif ifeq ($(USE_ZLIB),1) diff --git a/packages/Linux/Makefile.am b/packages/Linux/Makefile.am deleted file mode 100644 index 575305579..000000000 --- a/packages/Linux/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = RPM diff --git a/packages/Linux/RPM/.gitignore b/packages/Linux/RPM/.gitignore deleted file mode 100644 index 0b359fe7c..000000000 --- a/packages/Linux/RPM/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -curl-ssl.spec -curl.spec diff --git a/packages/Linux/RPM/Makefile.am b/packages/Linux/RPM/Makefile.am deleted file mode 100644 index 89f43d5e8..000000000 --- a/packages/Linux/RPM/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm diff --git a/packages/Linux/RPM/README b/packages/Linux/RPM/README deleted file mode 100644 index a6936ba56..000000000 --- a/packages/Linux/RPM/README +++ /dev/null @@ -1,4 +0,0 @@ -Author: Daniel (I'm not trustworthy, replace this!) - -Paul Marquis's 'make_curl_rpm' script is a fine example on how to automate the -jobs. You need to fill in your own name and email at least. diff --git a/packages/Linux/RPM/curl-ssl.spec.in b/packages/Linux/RPM/curl-ssl.spec.in deleted file mode 100644 index 5b45bb1a2..000000000 --- a/packages/Linux/RPM/curl-ssl.spec.in +++ /dev/null @@ -1,85 +0,0 @@ -%define name curl-ssl -%define tarball curl -%define version 7.11.0 -%define release 1 - -%define curlroot %{_builddir}/%{tarball}-%{version} - -Summary: get a file from an FTP or HTTP server. -Name: %{name} -Version: %{version} -Release: %{release} -Copyright: MIT/X derivate -Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.se> -Packager: Troy Engel <tengel@sonic.net> -Group: Utilities/Console -Source: %{tarball}-%{version}.tar.gz -URL: https://curl.haxx.se/ -Provides: curl -Obsoletes: curl -BuildRoot: %{_tmppath}/%{tarball}-%{version}-root -Requires: openssl >= 0.9.5 - -%description -curl is a client to get documents/files from servers, using any of the -supported protocols. The command is designed to work without user -interaction or any kind of interactivity. - -curl offers a busload of useful tricks like proxy support, user -authentication, ftp upload, HTTP post, file transfer resume and more. - -%package devel -Summary: The includes, libs, and man pages to develop with libcurl -Group: Development/Libraries -Requires: openssl-devel >= 0.9.5 -Provides: curl-devel - -%description devel -libcurl is the core engine of curl; this packages contains all the libs, -headers, and manual pages to develop applications using libcurl. - -%prep - -%setup -q -n %{tarball}-%{version} - -%build -cd %{curlroot} && (if [ -f configure.in ]; then mv -f configure.in configure.in.rpm; fi) -%configure -cd %{curlroot} && (if [ -f configure.in.rpm ]; then mv -f configure.in.rpm configure.in; fi) -make - -%install -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -make DESTDIR=%{buildroot} install-strip - -%clean -[ "%{buildroot}" != "/" ] && rm -rf %{buildroot} -[ "%{curlroot}" != "/" ] && rm -rf %{curlroot} - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root) -%attr(0755,root,root) %{_bindir}/curl -%attr(0644,root,root) %{_mandir}/man1/curl.1* -%attr(0644,root,root) %{_mandir}/man1/mk-ca-bundle.1 -%{_libdir}/libcurl.so* -%{_datadir}/curl/curl-ca-bundle.crt -%doc CHANGES COPYING README testcurl.sh docs/BUGS docs/SSLCERTS -%doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/HISTORY docs/INSTALL -%doc docs/KNOWN_BUGS docs/MANUAL docs/RESOURCES docs/THANKS -%doc docs/TODO docs/VERSIONS docs/TheArtOfHttpScripting tests - -%files devel -%defattr(-,root,root) -%attr(0755,root,root) %{_bindir}/curl-config -%attr(0644,root,root) %{_mandir}/man1/curl-config.1* -%attr(0644,root,root) %{_mandir}/man3/* -%attr(0644,root,root) %{_includedir}/curl/* -%{_libdir}/libcurl.a -%{_libdir}/libcurl.la -%doc docs/BINDINGS docs/INTERNALS docs/examples/* docs/libcurl-the-guide diff --git a/packages/Linux/RPM/curl.spec.in b/packages/Linux/RPM/curl.spec.in deleted file mode 100644 index 7d0b91800..000000000 --- a/packages/Linux/RPM/curl.spec.in +++ /dev/null @@ -1,83 +0,0 @@ -%define name curl -%define version @VERSION@ -%define release 1 -%define prefix /usr - -%define builddir $RPM_BUILD_DIR/%{name}-%{version} - -Summary: get a file from an FTP or HTTP server. -Name: %{name} -Version: %{version} -Release: %{release} -Copyright: MPL -Vendor: Daniel Stenberg <Daniel.Stenberg@haxx.se> -Packager: Loic Dachary <loic@senga.org> -Group: Utilities/Console -Source: %{name}-%{version}.tar.gz -URL: https://curl.haxx.se/ -BuildRoot: /tmp/%{name}-%{version}-root - -%description -curl is a client to get documents/files from servers, using any of the -supported protocols. The command is designed to work without user -interaction or any kind of interactivity. - -curl offers a busload of useful tricks like proxy support, user -authentication, ftp upload, HTTP post, file transfer resume and more. - -Note: this version is compiled without SSL (https:) support. - -%package devel -Summary: The includes, libs, and man pages to develop with libcurl -Group: Development/Libraries - -%description devel -libcurl is the core engine of curl; this packages contains all the libs, -headers, and manual pages to develop applications using libcurl. - -%prep -rm -rf %{builddir} - -%setup - -%build -%configure --without-ssl --prefix=%{prefix} -make - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install-strip - -%clean -rm -rf $RPM_BUILD_ROOT -rm -rf %{builddir} - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%files -%defattr(-,root,root) -%attr(0755,root,root) %{_bindir}/curl -%attr(0644,root,root) %{_mandir}/man1/* -%{prefix}/lib/libcurl.so* -%doc CHANGES LEGAL MITX.txt MPL-1.1.txt README docs/BUGS -%doc docs/CONTRIBUTE docs/FAQ docs/FEATURES docs/INSTALL docs/INTERNALS -%doc docs/LIBCURL docs/MANUAL docs/README* docs/RESOURCES docs/TODO -%doc docs/TheArtOfHttpScripting - -%files devel -%defattr(-,root,root) -%attr(0644,root,root) %{_mandir}/man3/* -%attr(0644,root,root) %{_includedir}/curl/* -%{prefix}/lib/libcurl.a -%{prefix}/lib/libcurl.la -%doc docs/examples/* - -%changelog -* Sun Jan 7 2001 Loic Dachary <loic@senga.org> - - - use _mandir instead of prefix to locate man pages because - _mandir is not always prefix/man/man?. diff --git a/packages/Linux/RPM/make_curl_rpm b/packages/Linux/RPM/make_curl_rpm deleted file mode 100644 index 544a23b67..000000000 --- a/packages/Linux/RPM/make_curl_rpm +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -# script to build curl RPM from src RPM (SSL and non-SSL versions) - -# initialize -top_dir=/usr/src/redhat -sources_dir=$top_dir/SOURCES -specs_dir=$top_dir/SPECS -rpms_dir=$top_dir/RPMS -arch=`rpm --showrc | awk 'NF == 3 && $2 == "_arch" { print $3 }'` - -# fill in your own name and email here -packager_name="Mr Joe Packager Person" -packager_email='<Joe@packager.person>' - -# make sure we're running as root -if test `id -u` -ne `id -u root` -then - echo "you must build the RPM as root" - exit 1 -fi - -# get version and release number -if test $# -lt 1 -then - echo "version number?" - read version -else - version=$1 -fi - -if test $# -lt 2 -then - echo "release number?" - read release -else - release=$2 -fi - -# build all the files -targets="curl curl-ssl" -for target in $targets -do - # make sure src RPM exist - src_rpm="$target-$version-$release.src.rpm" - if test -f $src_rpm - then - rpm -ivh $src_rpm - - # replace packager in spec file - sed -e 's/^Packager: .*/Packager: $packager_name $packager_email/' $specs_dir/$target.spec > $specs_dir/$target-$version-$arch.spec - - # build it - if ! rpm -ba $specs_dir/$target-$version-$arch.spec - then - echo "error building $target for $arch -- check output above" - fi - - echo "$target rpm is now in $rpms_dir/$arch" - else - echo $src_rpm does not exist - fi -done diff --git a/packages/Makefile.am b/packages/Makefile.am index b2e7228c9..9a2af064d 100644 --- a/packages/Makefile.am +++ b/packages/Makefile.am @@ -1,10 +1,8 @@ -SUBDIRS = Win32 Linux Solaris AIX vms +SUBDIRS = vms EXTRA_DIST = README \ DOS/README \ DOS/common.dj \ - NetWare/get_ver.awk \ - NetWare/get_exp.awk \ OS400/README.OS400 \ OS400/ccsidcurl.c \ OS400/ccsidcurl.h \ diff --git a/packages/NetWare/get_exp.awk b/packages/NetWare/get_exp.awk deleted file mode 100644 index 9bbb012ac..000000000 --- a/packages/NetWare/get_exp.awk +++ /dev/null @@ -1,71 +0,0 @@ -# *************************************************************************** -# * _ _ ____ _ -# * Project ___| | | | _ \| | -# * / __| | | | |_) | | -# * | (__| |_| | _ <| |___ -# * \___|\___/|_| \_\_____| -# * -# * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. -# * -# * This software is licensed as described in the file COPYING, which -# * you should have received as part of this distribution. The terms -# * are also available at https://curl.haxx.se/docs/copyright.html. -# * -# * You may opt to use, copy, modify, merge, publish, distribute and/or sell -# * copies of the Software, and permit persons to whom the Software is -# * furnished to do so, under the terms of the COPYING file. -# * -# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# * KIND, either express or implied. -# * -# *************************************************************************** -# awk script which fetches curl function symbols from public header input -# files and write them to STDOUT. Here you can get an awk version for Win32: -# http://www.gknw.net/development/prgtools/awk-20100523.zip -# -BEGIN { - add_symbol("curl_strequal") - add_symbol("curl_strnequal") -} - -function add_symbol(sym_name) { - sub(" ", "", sym_name) - exports[++idx] = sym_name -} - - -/^CURL_EXTERN .* [*]?curl_.*[(]/ { - sub("[(].*", "") - sub("^.* ", "") - sub("^[*]", "") - add_symbol($0) -} - -END { - printf("Added %d symbols to export list.\n", idx) > "/dev/stderr" - # sort symbols with shell sort - increment = int(idx / 2) - while (increment > 0) { - for (i = increment+1; i <= idx; i++) { - j = i - temp = exports[i] - while ((j >= increment+1) && (exports[j-increment] > temp)) { - exports[j] = exports[j-increment] - j -= increment - } - exports[j] = temp - } - if (increment == 2) - increment = 1 - else - increment = int(increment*5/11) - } - # print the array - if (EXPPREFIX) { - printf(" (%s)\n", EXPPREFIX) - } - while (x < idx - 1) { - printf(" %s,\n", exports[++x]) - } - printf(" %s\n", exports[++x]) -} diff --git a/packages/NetWare/get_ver.awk b/packages/NetWare/get_ver.awk deleted file mode 100644 index 2db2be98f..000000000 --- a/packages/NetWare/get_ver.awk +++ /dev/null @@ -1,43 +0,0 @@ -# *************************************************************************** -# * _ _ ____ _ -# * Project ___| | | | _ \| | -# * / __| | | | |_) | | -# * | (__| |_| | _ <| |___ -# * \___|\___/|_| \_\_____| -# * -# * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. -# * -# * This software is licensed as described in the file COPYING, which -# * you should have received as part of this distribution. The terms -# * are also available at https://curl.haxx.se/docs/copyright.html. -# * -# * You may opt to use, copy, modify, merge, publish, distribute and/or sell -# * copies of the Software, and permit persons to whom the Software is -# * furnished to do so, under the terms of the COPYING file. -# * -# * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# * KIND, either express or implied. -# * -# *************************************************************************** -# awk script which fetches curl version number and copyright string from input -# file and writes them to STDOUT. Here you can get an awk version for Win32: -# http://www.gknw.net/development/prgtools/awk-20100523.zip -# -BEGIN { - while ((getline < ARGV[1]) > 0) { - sub("\r", "") # make MSYS gawk work with CRLF header input. - if (match ($0, /^#define LIBCURL_COPYRIGHT "([^"]+)"$/)) - copyright_string = substr($0, 28, length($0)-28) - else if (match ($0, /^#define LIBCURL_VERSION "[^"]+"$/)) - version_string = substr($3, 2, length($3)-2) - else if (match ($0, /^#define LIBCURL_VERSION_MAJOR [0-9]+$/)) - version_major = $3 - else if (match ($0, /^#define LIBCURL_VERSION_MINOR [0-9]+$/)) - version_minor = $3 - else if (match ($0, /^#define LIBCURL_VERSION_PATCH [0-9]+$/)) - version_patch = $3 - } - print "LIBCURL_VERSION = " version_major "," version_minor "," version_patch - print "LIBCURL_VERSION_STR = " version_string - print "LIBCURL_COPYRIGHT_STR = " copyright_string -} diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index aaa8a3256..796086af2 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -75,6 +75,7 @@ options: CURLOPT_CUSTOMREQUEST CURLOPT_DEFAULT_PROTOCOL CURLOPT_DNS_SERVERS + CURLOPT_DOH_URL CURLOPT_EGDSOCKET CURLOPT_ENCODING CURLOPT_FTPPORT diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index af53f6761..b1d3ba845 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1125,7 +1125,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) if(testwarn) { testwarn = 0; - if((int) STRING_LASTZEROTERMINATED != (int) STRING_TARGET + 1 || + if((int) STRING_LASTZEROTERMINATED != (int) STRING_DOH + 1 || (int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1) curl_mfprintf(stderr, "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); @@ -1147,6 +1147,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_CUSTOMREQUEST: case CURLOPT_DEFAULT_PROTOCOL: case CURLOPT_DNS_SERVERS: + case CURLOPT_DOH_URL: case CURLOPT_EGDSOCKET: case CURLOPT_ENCODING: case CURLOPT_FTPPORT: @@ -1424,3 +1425,46 @@ curl_mime_data_ccsid(curl_mimepart *part, free(s); return result; } + +CURLUcode +curl_url_get_ccsid(CURLU *handle, CURLUPart what, char **part, + unsigned int flags, unsigned int ccsid) + +{ + char *s = (char *)NULL; + CURLUcode result; + + if(!part) + return CURLUE_BAD_PARTPOINTER; + + *part = (char *)NULL; + result = curl_url_get(handle, what, &s, flags); + if(result == CURLUE_OK) { + if(s) { + *part = dynconvert(ccsid, s, -1, ccsid, ASCII_CCSID); + if(!*part) + result = CURLUE_OUT_OF_MEMORY; + } + if(s) + free(s); + return result; +} + +CURLUcode +curl_url_set_ccsid(CURLU *handle, CURLUPart what, const char *part, + unsigned int flags, unsigned int ccsid) + +{ + char *s = (char *)NULL; + CURLUcode result; + + if(part) { + s = dynconvert(ASCII_CCSID, part, -1, ccsid); + if(!s) + return CURLUE_OUT_OF_MEMORY; + } + result = curl_url_set(handle, what, s, flags); + if(s) + free(s); + return result; +} diff --git a/packages/OS400/ccsidcurl.h b/packages/OS400/ccsidcurl.h index a65dfbc2a..895db7002 100644 --- a/packages/OS400/ccsidcurl.h +++ b/packages/OS400/ccsidcurl.h @@ -85,5 +85,11 @@ CURL_EXTERN CURLcode curl_mime_filedata_ccsid(curl_mimepart *part, CURL_EXTERN CURLcode curl_mime_data_ccsid(curl_mimepart *part, const char *data, size_t datasize, unsigned int ccsid); +CURL_EXTERN CURLUcode curl_url_get_ccsid(CURLU *handle, CURLUPart what, + char **part, unsigned int flags, + unsigned int ccsid); +CURL_EXTERN CURLUcode curl_url_set_ccsid(CURLU *handle, CURLUPart what, + const char *part, unsigned int flags, + unsigned int ccsid); #endif diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 2cf7899bd..b13358704 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -369,6 +369,27 @@ d CURL_WAIT_POLLOUT... d c X'0004' * + d CURLU_DEFAULT_PORT... + d c X'00000001' + d CURLU_NO_DEFAULT_PORT... + d c X'00000002' + d CURLU_DEFAULT_SCHEME... + d c X'00000004' + d CURLU_NON_SUPPORT_SCHEME... + d c X'00000008' + d CURLU_PATH_AS_IS... + d c X'00000010' + d CURLU_DISALLOW_USER... + d c X'00000020' + d CURLU_URLDECODE... + d c X'00000040' + d CURLU_URLENCODE... + d c X'00000080' + d CURLU_APPENDQUERY... + d c X'00000100' + d CURLU_GUESS_SCHEME... + d c X'00000200' + * ************************************************************************** * Types ************************************************************************** @@ -480,7 +501,7 @@ d c 49 d CURLE_OBSOLETE50... d c 50 - d CURLE_PEER_FAILED_VERIFICATION... + d CURLE_OBSOLETE51... d c 51 d CURLE_GOT_NOTHING... d c 52 @@ -498,7 +519,7 @@ d c 58 d CURLE_SSL_CIPHER... d c 59 - d CURLE_SSL_CACERT... + d CURLE_PEER_FAILED_VERIFICATION... d c 60 d CURLE_BAD_CONTENT_ENCODING... d c 61 @@ -565,6 +586,9 @@ d CURLE_HTTP2_STREAM... d c 92 * + d CURLE_PEER_FAILED_VERIFICATION... + d c 60 + * /if not defined(CURL_NO_OLDIES) d CURLE_URL_MALFORMAT_USER... d c 4 @@ -727,6 +751,12 @@ d CURLSSLOPT_NO_REVOKE... d c X'0002' * + d CURL_HET_DEFAULT... + d c 200 + * + d CURL_UPKEEP_INTERVAL_DEFAULT... + d c 60000 + * /if not defined(CURL_NO_OLDIES) d curl_ftpssl s like(curl_usessl) d based(######ptr######) @@ -1348,6 +1378,13 @@ d c 10277 d CURLOPT_DISALLOW_USERNAME_IN_URL... d c 00278 + d CURLOPT_DOH_URL... + d c 10279 + d CURLOPT_UPLOAD_BUFFERSIZE... + d c 00280 + d CURLOPT_UPKEEP_INTERVAL_MS... + d c 00281 + d CURLOPT_CURLU c 10282 * /if not defined(CURL_NO_OLDIES) d CURLOPT_FILE c 10001 @@ -1804,7 +1841,64 @@ d c 12 d CURL_RTSPREQ_LAST... d c 13 - + * + d CURLUcode s 10i 0 based(######ptr######) Enum + d CURLUE_OK c 0 + d CURLUE_BAD_HANDLE... + d c 1 + d CURLUE_BAD_PARTPOINTER... + d c 2 + d CURLUE_MALFORMED_INPUT... + d c 3 + d CURLUE_BAD_PORT_NUMBER... + d c 4 + d CURLUE_UNSUPPORTED_SCHEME... + d c 5 + d CURLUE_URLDECODE... + d c 6 + d CURLUE_OUT_OF_MEMORY... + d c 7 + d CURLUE_USER_NOT_ALLOWED... + d c 8 + d CURLUE_UNKNOWN_PART... + d c 9 + d CURLUE_NO_SCHEME... + d c 10 + d CURLUE_NO_USER... + d c 11 + d CURLUE_NO_PASSWORD... + d c 12 + d CURLUE_NO_OPTIONS... + d c 13 + d CURLUE_NO_HOST... + d c 14 + d CURLUE_NO_PORT... + d c 15 + d CURLUE_NO_QUERY... + d c 16 + d CURLUE_NO_FRAGMENT... + d c 17 + * + d CURLUPart s 10i 0 based(######ptr######) Enum + d CURLUPART_URL c 0 + d CURLUPART_SCHEME... + d c 1 + d CURLUPART_USER... + d c 2 + d CURLUPART_PASSWORD... + d c 3 + d CURLUPART_OPTIONS... + d c 4 + d CURLUPART_HOST... + d c 5 + d CURLUPART_PORT... + d c 6 + d CURLUPART_PATH... + d c 7 + d CURLUPART_QUERY... + d c 8 + d CURLUPART_FRAGMENT... + d c 9 * * Renaming CURLMsg to CURL_Msg to avoid case-insensivity name clash. * @@ -2350,9 +2444,15 @@ * d curl_easy_pause... d pr extproc('curl_easy_pause') + d like(CURLcode) d curl * value CURL * d bitmask 10i 0 value * + d curl_easy_conn_upkeep... + d pr extproc('curl_easy_conn_upkeep') + d like(CURLcode) + d curl * value CURL * + * d curl_multi_init... d pr * extproc('curl_multi_init') CURLM * * @@ -2486,6 +2586,29 @@ d sockfd value like(curl_socket_t) d sockp * value void * * + d curl_url pr * extproc('curl_url') CURLU * + * + d curl_url_cleanup... + d pr extproc('curl_url_cleanup') + d handle * value CURLU * + * + d curl_url_dup pr * extproc('curl_url_dup') CURLU * + d in * value CURLU * + * + d curl_url_get pr extproc('curl_url_get') + d like(CURLUcode) + d handle * value CURLU * + d what value like(CURLUPart) + d part * char ** + d flags 10u 0 value + * + d curl_url_set pr extproc('curl_url_set') + d like(CURLUcode) + d handle * value CURLU * + d what value like(CURLUPart) + d part * value options(*string) + d flags 10u 0 value + * ************************************************************************** * CCSID wrapper procedure prototypes ************************************************************************** @@ -2642,4 +2765,22 @@ d filename * value options(*string) d ccsid 10u 0 value * + d curl_url_get_ccsid... + d pr extproc('curl_url_get_ccsid') + d like(CURLUcode) + d handle * value CURLU * + d what value like(CURLUPart) + d part * char ** + d flags 10u 0 value + d ccsid 10u 0 value + * + d curl_url_set_ccsid... + d pr extproc('curl_url_set_ccsid') + d like(CURLUcode) + d handle * value CURLU * + d what value like(CURLUPart) + d part * value options(*string) + d flags 10u 0 value + d ccsid 10u 0 value + * /endif diff --git a/packages/Solaris/Makefile.am b/packages/Solaris/Makefile.am deleted file mode 100644 index d0129479f..000000000 --- a/packages/Solaris/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# -# - -PKGADD_PKG="@PKGADD_PKG@" -PKGADD_NAME="@PACKAGE@-@VERSION@ - @PKGADD_NAME@" -PKGADD_VENDOR="@PKGADD_VENDOR@" -PKGADD_ARCH="@host_cpu@" -PKGADD_DESC="@PACKAGE@-@VERSION@ - @PKGADD_NAME@" -PKGADD_CLASSES=none -PKGADD_BASEDIR=/ - -PKGADD_FILE=${PKGADD_PKG}-@PACKAGE@-@VERSION@-@host@.pkg - -package: - if [ ! -f release ]; then echo 0 > release; fi - if [ `find root -newer release -print|wc -l` -gt 0 ]; then expr `cat release` + 1 > release; fi - echo PKG=${PKGADD_PKG} > pkginfo - echo NAME=${PKGADD_NAME} >> pkginfo - echo VENDOR=${PKGADD_VENDOR} >> pkginfo - echo ARCH=${PKGADD_ARCH} >> pkginfo - echo DESC=${PKGADD_DESC} >> pkginfo - echo CLASSES=${PKGADD_CLASSES} >> pkginfo - echo BASEDIR=${PKGADD_BASEDIR} >> pkginfo - echo CATEGORY=application >> pkginfo - echo VERSION=`cat ./release` >> pkginfo - echo > prototype - for subdir in opt var etc usr; \ - do if [ -d root/$$subdir ]; then \ - pkgproto root/$$subdir=$$subdir >> prototype;\ - fi; done - for file in pkginfo preinstall postinstall copyright; \ - do if [ -f $$file ]; then \ - echo "i $$file=$$file" >> prototype; \ - fi; done - rm -rf ./tmp - mkdir ./tmp - pkgmk -o -d ./tmp - pkgtrans -so ./tmp ${top_srcdir}/../${PKGADD_FILE} ${PKGADD_PKG} diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index 6f0fb78cc..f125654e0 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -35,7 +35,7 @@ SOURCE \ socks_sspi.c curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c \ pop3.c smtp.c pingpong.c rtsp.c curl_threads.c warnless.c hmac.c \ vtls/polarssl.c curl_rtmp.c openldap.c curl_gethostname.c gopher.c \ - vtls/axtls.c idn_win32.c vtls/cyassl.c http_proxy.c non-ascii.c \ + idn_win32.c vtls/cyassl.c http_proxy.c non-ascii.c \ asyn-ares.c asyn-thread.c curl_gssapi.c http_ntlm.c curl_ntlm_wb.c \ curl_ntlm_core.c curl_sasl.c vtls/schannel.c curl_multibyte.c \ vtls/darwinssl.c conncache.c curl_sasl_sspi.c smb.c curl_endian.c \ diff --git a/packages/Win32/Makefile.am b/packages/Win32/Makefile.am deleted file mode 100644 index 93350ea13..000000000 --- a/packages/Win32/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = cygwin - -EXTRA_DIST = README diff --git a/packages/Win32/README b/packages/Win32/README deleted file mode 100644 index f21967431..000000000 --- a/packages/Win32/README +++ /dev/null @@ -1,53 +0,0 @@ -Author: Jörn Hartroth - -DESCRIPTION - -(If you're only looking for precompiled win32 binaries, go visit -https://curl.haxx.se/download.html) - -Packaging of the curl binaries for Win32 should at this point in time be based -on the InfoZip (zip/unzip) archiver family as the de-facto standard for -Windows archives. A package should contain the main binary curl.exe along with -the appropriate documentation and license information files. For development -releases, you should also include the header directory and probably the -compiled binaries of libcurl and the appropriate Makefiles/project definition -files for the compiler used. - -A simple packaging mechanism can be based on a set of batch files which call -zip.exe with the appropriate files from the curl distribution - see the -samples included below (Long lines have been split with "\" as the split -marker, you'll want to rejoin the pieces to be all on one line in the batch -file). Call any of these batch files - after compiling the curl binaries - -with a single parameter specifying the name of the archive file to be created. - -It is implicitly assumed that all of the binary files (curl.exe, libcurl.a, -etc) have previously been copied to the main directory of the curl source -package (the directory where the main README resides), because that is where -they should end up in the zip archive. The archive should *not* be built with -absolute path information because the user will want to locally extract the -archive contents and shift the binaries to his executable directory. - -SCRIPT_TEMPLATES - -curlpkg.bat: - zip -9 %1 curl.exe CHANGES LEGAL MPL-1.0.txt README \ - docs/FAQ docs/FEATURES docs/README.curl docs/README.win32 docs/TODO - -curldevpkg.bat: - zip -9 %1 curl.exe include\README include\curl\*.h CHANGES docs\* \ - curl.spec curl-ssl.spec LEGAL lib/Makefile.m32 src/Makefile.m32 \ - libcurl.a libcurl.dll libcurldll.a MPL-1.0.txt README - -PROCEDURE_EXAMPLE - -A standard packaging routine (for MingW32) using the above batch files could -go like this: -(No SSL) (With SSL) -cd <curl-sourcedir>\lib cd <curl-sourcedir>\lib -make -f Makefile.m32 make -f Makefile.m32 SSL=1 -cd ..\src cd ..\src -make -f Makefile.m32 make -f Makefile.m32 SSL=1 -cd .. cd .. -copy lib\libcurl.a . copy lib\libcurl.a . -copy src\curl.exe . copy src\curl.exe . -curlpkg curl-win32-nossl.zip curlpkg curl-win32-ssl.zip diff --git a/packages/Win32/cygwin/Makefile.am b/packages/Win32/cygwin/Makefile.am deleted file mode 100644 index b56148dc9..000000000 --- a/packages/Win32/cygwin/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -EXTRA_DIST = README - -# -# Build a Cygwin binary tar ball -# -# Read the README file for details on using this Makefile -# -# NOTE: As I'm not particularly familiar with Makefiles, this was the -# best I could come up with. It should probably be enhanced someday -# to actually use the correct target and pre-requisite names, etc... -# If anyone else wants to volunteer, feel free ;-) -# - -# Cygwin build number (default to "1") -CYGBUILD = 1 - -# Cygwin tarball build dir (fully-qualified name, gets deleted when done) -cygwintmp = $(CURDIR)/tmp_binbuild - -cygwinbin: - rm -rf $(cygwintmp) - rm -rf $(cygwintmp)-dev - $(MAKE) -C $(top_builddir) DESTDIR=$(cygwintmp) install-strip -# $(STRIP) $(cygwintmp)/usr/bin/cygcurl-?.dll - $(mkinstalldirs) \ - $(cygwintmp)$(datadir)/doc/Cygwin \ - $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) \ - $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/libcurl \ - $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples \ - $(cygwintmp)-dev$(mandir) -# -# copy some files into the binary install dir - cp $(srcdir)/README \ - $(cygwintmp)$(datadir)/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README - cd $(top_srcdir) ; cp CHANGES COPYING README RELEASE-NOTES docs/* \ - $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) ; pwd - cd $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) ; rm *.1 Makefile* -# -# copy some files into the -dev install dir, remove some from binary - cp $(top_srcdir)/docs/libcurl/*.html \ - $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/libcurl - cp $(top_srcdir)/docs/examples/* \ - $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples - rm $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples/Makefile* - cp $(top_srcdir)/docs/examples/Makefile.example \ - $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples - mv $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION)/BINDINGS \ - $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION) - mv $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION)/INTERNALS \ - $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION) - mv $(cygwintmp)/usr/include $(cygwintmp)-dev/usr - mv $(cygwintmp)/usr/lib $(cygwintmp)-dev/usr - mv $(cygwintmp)$(mandir)/man3 $(cygwintmp)-dev$(mandir) -# -# create both tar files, and delete tmp folders - cd $(cygwintmp) ; tar cjf \ - $(PACKAGE)-$(VERSION)-$(CYGBUILD).tar.bz2 usr - mv $(cygwintmp)/*.tar.bz2 . && rm -rf $(cygwintmp) -# - cd $(cygwintmp)-dev ; tar cjf \ - $(PACKAGE)-devel-$(VERSION)-$(CYGBUILD).tar.bz2 usr - mv $(cygwintmp)-dev/*.tar.bz2 . && rm -rf $(cygwintmp)-dev diff --git a/packages/Win32/cygwin/README b/packages/Win32/cygwin/README deleted file mode 100644 index 9a61341de..000000000 --- a/packages/Win32/cygwin/README +++ /dev/null @@ -1,114 +0,0 @@ -Curl is a tool for transferring files with URL syntax, supporting - FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE and LDAP. - Curl supports HTTPS certificates, HTTP POST, HTTP PUT, - FTP uploading, kerberos, HTTP form based upload, proxies, - cookies, user+password authentication, file transfer resume, - http proxy tunneling and a busload of other useful tricks. - -See /usr/doc/curl-$(VERSION)/FEATURES for more info. - - -Dependencies: - - Cygwin - - OpenSSL 0.9.6b-2+ (*) - - (*) curl can be built without SSL support, see below for details - - -Canonical Homepage and Downloads: - https://curl.haxx.se/ - https://curl.haxx.se/download.html - - -Cygwin specific source files (a .README template and a Makefile - for building binary tarballs) are maintained in the upstream - CVS at: <srctop>/packages/Win32/cygwin/ - - -Build Instructions (to recompile from the cygwin source tarball): - ---STANDARD (with SSL) RELEASE--- - Download the source (either the official release or the cygwin version), - unpack it (done for you if using setup.exe), then: - - $ ./configure --prefix=/usr --mandir=/usr/share/man # (*) - $ make - $ make test # optional - $ make install # (**) - - (*) The Cygwin project now (as of sometime in 2003) prefers man pages - within /usr/share/man, as opposed to the default /usr/man. - - (**) LibTool 1.4.2 had a bug related to cygwin's use of ".exe" extensions, - such that "make install" blew up at curl.exe. See this URL for details: - https://lists.gnu.org/archive/html/libtool/2001-09/msg00101.html - The copy of ltmain.sh that is distributed with curl includes this patch. - - As of curl 7.9.1, the official source compiles (under Cygwin) and tests - 100% cleanly OOTB (Out Of The Box) - - ---NO SSL RELEASE--- - Same as standard, except for the configure step, which changes to: - - $ ./configure --prefix=/usr --mandir=/usr/share/man --without-ssl - - NOTE: the standard release is what is available via Cygwin's setup.exe; - the no-ssl release is only available from the curl website - - -Packaging Instructions: - ---BINARY--- - Compile cleanly as described above, then: - - $ make cygwinbin CYGBUILD=n - - where n is the cygwin release number (e.g. the "1" in curl-7.9-1), - and "CYGBUILD=n" is optional (n defaults to 1 if not specified) - - Assuming everything worked, you'll find your binary tarballs in - $(buildtop)/packages/Win32/cygwin/ - - ---SOURCE--- - 1. download & unpack the pristine source - 2. rename the source dir to add the "-$(REL)" suffix, e.g.: - $ mv curl-7.9 curl-7.9-1 - 3. unpack the pristine source once more, so you'll end up - with 2 directories: "curl-7.9" and "curl-7.9-1" in this example - 3. add a CYGWIN-PATCHES directory, and add this readme to it - $ cd curl-7.9-1; mkdir CYGWIN-PATCHES - $ cp packages/Win32/cygwin/README CYGWIN-PATCHES/curl-7.9-1.README - 4. if applicable, document any changes in the README file - 5. create a patch which, when applied - (using `patch -p1 < curl-7.9-$(REL).patch`) - will remove any changes you've made to the pristine source: - $ cd .. - $ diff -Nrup curl-7.9-1 curl-7.9 > curl-7.9-1.patch - and then move it into the CYGWIN-PATCHES directory - $ mv curl-7.9-1.patch curl-7.9-1/CYGWIN-PATCHES - 6. pack the new source dir into a tar.bz2 file: - $ tar cfj curl-7.9-1-src.tar.bz2 curl-7.9-1 - - ---SETUP.HINT--- - @ curl - sdesc: "a client that groks URLs" - ldesc: "Curl is a tool for transferring files with URL syntax, - supporting FTP, FTPS, HTTP, HTTPS, TELNET, DICT, FILE - and LDAP. Curl supports HTTPS certificates, HTTP POST, HTTP PUT, - FTP uploading, kerberos, HTTP form based upload, proxies, - cookies, user+password authentication, file transfer resume, - http proxy tunneling and a busload of other useful tricks." - category: Web Libs - requires: cygwin openssl - - @ curl-devel - sdesc: "(lib)curl headers, static libraries, developer docs and samples" - ldesc: "curl-devel is the developer-oriented (non-run-time) parts - of the curl package. It includes header files, static libraries, - example source code snippets, and the libcurl man pages." - category: Web Libs Devel - requires: cygwin openssl curl - - -Cygwin port maintained by: - Kevin Roth <kproth @ users . sourceforge . net> - Questions about curl should be directed to curl-users@cool.haxx.se. - Questions about this cygwin package go to cygwin@cygwin.com. diff --git a/packages/vms/generate_config_vms_h_curl.com b/packages/vms/generate_config_vms_h_curl.com index 90a83d588..6e1b2024f 100644 --- a/packages/vms/generate_config_vms_h_curl.com +++ b/packages/vms/generate_config_vms_h_curl.com @@ -325,9 +325,6 @@ $! configure defaults to USE_*, a real configure on VMS chooses different. $write cvh "#ifdef USE_ARES" $write cvh "#undef USE_ARES" $write cvh "#endif" -$write cvh "#ifdef USE_AXTLS" -$write cvh "#undef USE_AXTLS" -$write cvh "#endif" $write cvh "#ifdef USE_CYASSL" $write cvh "#undef USE_CYASSL" $write cvh "#endif" @@ -407,9 +404,6 @@ $! $ write cvh "#ifndef USE_OPENSSL" $ write cvh "#define USE_OPENSSL 1" $ write cvh "#endif" -$ write cvh "#ifndef USE_SSLEAY" -$ write cvh "#define USE_SSLEAY 1" -$ write cvh "#endif" $ if arch_name .eqs. "VAX" $ then $ old_mes = f$enviroment("message") diff --git a/packages/vms/gnv_link_curl.com b/packages/vms/gnv_link_curl.com index 64b0aa87e..7ec4ecb09 100644 --- a/packages/vms/gnv_link_curl.com +++ b/packages/vms/gnv_link_curl.com @@ -740,7 +740,7 @@ gnv$libcurl/share $endif $! $! -$target = "persistant" +$target = "persistent" $if f$search("[.docs.examples]''target'.exe") .eqs. "" $then $ define/user gnv$libcurl 'gnv_libcurl_share' diff --git a/packages/vms/setup_gnv_curl_build.com b/packages/vms/setup_gnv_curl_build.com index 09f22a22e..03d5c0b4d 100644 --- a/packages/vms/setup_gnv_curl_build.com +++ b/packages/vms/setup_gnv_curl_build.com @@ -207,7 +207,7 @@ $ example_apps = example_apps + ",ftpupload,getinfo,getinmemory" $ example_apps = example_apps + ",http-post,httpcustomheader,httpput" $ example_apps = example_apps + ",https,multi-app,multi-debugcallback" $ example_apps = example_apps + ",multi-double,multi-post,multi-single" -$ example_apps = example_apps + ",persistant,post-callback,postit2" +$ example_apps = example_apps + ",persistent,post-callback,postit2" $ example_apps = example_apps + ",sendrecv,sepheaders,simple,simplepost" $ example_apps = example_apps + ",simplessl" $! |