← Commit list

c4e6968127

Daniel Stenberg
Daniel Stenberg
2020-05-30
FAILED Duration: 618s

Subject

url: alloc the download buffer at transfer start

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f c4e6968127e876b01e5e0b4b7cdbc49d5267530c
Previous HEAD position was f3d501dc67 build: disable more code/data when built without proxy support
HEAD is now at c4e6968127 url: alloc the download buffer at transfer start

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing confdefs.h
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/Makefile.in
Removing lib/curl_config.h.in
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile.in
Removing packages/vms/Makefile.in
Removing scripts/Makefile.in
Removing src/Makefile
Removing src/Makefile.in
Removing test-driver
Removing tests/Makefile.in
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile.in
Removing tests/data/Makefile.in
Removing tests/libtest/Makefile.in
Removing tests/server/Makefile.in
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:44: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:44: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:147: CURL_CHECK_OPTION_DEBUG is expanded from...
configure.ac:44: the top level
configure.ac:45: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:45: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:181: CURL_CHECK_OPTION_OPTIMIZE is expanded from...
configure.ac:45: the top level
configure.ac:46: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:46: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:360: CURL_CHECK_OPTION_WARNINGS is expanded from...
configure.ac:46: the top level
configure.ac:47: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:47: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:394: CURL_CHECK_OPTION_WERROR is expanded from...
configure.ac:47: the top level
configure.ac:48: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:48: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:94: CURL_CHECK_OPTION_CURLDEBUG is expanded from...
configure.ac:48: the top level
configure.ac:49: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:49: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:237: CURL_CHECK_OPTION_SYMBOL_HIDING is expanded from...
configure.ac:49: the top level
configure.ac:50: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:50: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:58: CURL_CHECK_OPTION_ARES is expanded from...
configure.ac:50: the top level
configure.ac:51: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:51: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:328: CURL_CHECK_OPTION_RT is expanded from...
configure.ac:51: the top level
configure.ac:52: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:52: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:658: CURL_CHECK_OPTION_ESNI is expanded from...
configure.ac:52: the top level
configure.ac:123: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:123: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-functions.m4:7304: CURL_COVERAGE is expanded from...
configure.ac:123: the top level
configure.ac:375: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:375: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:375: the top level
configure.ac:376: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:376: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:376: the top level
configure.ac:394: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:394: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:394: the top level
configure.ac:395: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:395: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:395: the top level
configure.ac:409: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:409: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:409: the top level
configure.ac:410: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:410: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:410: the top level
configure.ac:424: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:424: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:424: the top level
configure.ac:425: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:425: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:425: the top level
configure.ac:440: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:440: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:440: the top level
configure.ac:441: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:441: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:441: the top level
configure.ac:472: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:472: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:472: the top level
configure.ac:473: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:473: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:473: the top level
configure.ac:498: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:498: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:498: the top level
configure.ac:499: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:499: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:499: the top level
configure.ac:514: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:514: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:514: the top level
configure.ac:515: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:515: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:515: the top level
configure.ac:529: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:529: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:529: the top level
configure.ac:530: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:530: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:530: the top level
configure.ac:544: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:544: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:544: the top level
configure.ac:545: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:545: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:545: the top level
configure.ac:560: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:560: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:560: the top level
configure.ac:561: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:561: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:561: the top level
configure.ac:577: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:577: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:577: the top level
configure.ac:578: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:578: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:578: the top level
configure.ac:594: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:594: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:594: the top level
configure.ac:595: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:595: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:595: the top level
configure.ac:610: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:610: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:610: the top level
configure.ac:611: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:611: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:611: the top level
configure.ac:626: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:626: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:626: the top level
configure.ac:627: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:627: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:627: the top level
configure.ac:642: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:642: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:642: the top level
configure.ac:643: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:643: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:643: the top level
configure.ac:663: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:663: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:663: the top level
configure.ac:664: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:664: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:664: the top level
configure.ac:684: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:684: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:684: the top level
configure.ac:685: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:685: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:685: the top level
configure.ac:704: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:704: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:704: the top level
configure.ac:911: warning: The macro `AC_HEADER_TIME' is obsolete.
configure.ac:911: You should run autoupdate.
./lib/autoconf/headers.m4:743: AC_HEADER_TIME is expanded from...
acinclude.m4:1575: CURL_CHECK_FUNC_CLOCK_GETTIME_MONOTONIC is expanded from...
acinclude.m4:1618: CURL_CHECK_LIBS_CLOCK_GETTIME_MONOTONIC is expanded from...
configure.ac:911: the top level
configure.ac:932: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:932: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:932: the top level
configure.ac:933: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:933: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:933: the top level
configure.ac:1039: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1039: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1039: the top level
configure.ac:1040: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1040: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1040: the top level
configure.ac:1124: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1124: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1124: the top level
configure.ac:1129: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1129: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1129: the top level
configure.ac:1210: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1210: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1210: the top level
configure.ac:1211: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1211: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1211: the top level
configure.ac:1222: warning: The macro `AC_TRY_RUN' is obsolete.
configure.ac:1222: You should run autoupdate.
./lib/autoconf/general.m4:2997: AC_TRY_RUN is expanded from...
configure.ac:1222: the top level
configure.ac:1260: warning: The macro `AC_TRY_COMPILE' is obsolete.
configure.ac:1260: You should run autoupdate.
./lib/autoconf/general.m4:2847: AC_TRY_COMPILE is expanded from...
configure.ac:1260: the top level
configure.ac:1321: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1321: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1321: the top level
configure.ac:1328: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1328: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1328: the top level
configure.ac:1335: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1335: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1335: the top level
configure.ac:1501: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1501: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1501: the top level
configure.ac:1502: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1502: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1502: the top level
configure.ac:1528: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1528: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1528: the top level
configure.ac:1529: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1529: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1529: the top level
configure.ac:1533: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1533: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1533: the top level
configure.ac:1534: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1534: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1534: the top level
configure.ac:1563: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1563: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1563: the top level
configure.ac:1564: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1564: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1564: the top level
configure.ac:1568: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1568: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1568: the top level
configure.ac:1569: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1569: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1569: the top level
configure.ac:1593: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1593: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1593: the top level
configure.ac:1594: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1594: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1594: the top level
configure.ac:1629: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1629: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1629: the top level
configure.ac:1630: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1630: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1630: the top level
configure.ac:1648: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1648: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
configure.ac:1648: the top level
configure.ac:1740: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1740: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
configure.ac:1740: the top level
configure.ac:1740: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:1740: You should run autoupdate.
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/general.m4:2894: _AC_LINK_IFELSE is expanded from...
./lib/autoconf/general.m4:2911: AC_LINK_IFELSE is expanded from...
./lib/autoconf/general.m4:2920: AC_TRY_LINK is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
lib/m4sugar/m4sh.m4:692: _AS_IF_ELSE is expanded from...
lib/m4sugar/m4sh.m4:699: AS_IF is expanded from...
./lib/autoconf/libs.m4:100: AC_CHECK_LIB is expanded from...
configure.ac:1740: the top level
configure.ac:1956: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1956: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1956: the top level
configure.ac:1967: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:1967: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:1967: the top level
configure.ac:2002: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2002: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2002: the top level
configure.ac:2003: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2003: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2003: the top level
configure.ac:2019: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2019: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2019: the top level
configure.ac:2020: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2020: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2020: the top level
configure.ac:2180: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2180: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2180: the top level
configure.ac:2181: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2181: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2181: the top level
configure.ac:2274: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2274: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2274: the top level
configure.ac:2275: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2275: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2275: the top level
configure.ac:2377: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2377: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2377: the top level
configure.ac:2378: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2378: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2378: the top level
configure.ac:2468: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2468: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2468: the top level
configure.ac:2469: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2469: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2469: the top level
configure.ac:2559: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2559: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2559: the top level
configure.ac:2560: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2560: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2560: the top level
configure.ac:2725: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2725: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
acinclude.m4:2163: CURL_CHECK_CA_BUNDLE is expanded from...
configure.ac:2725: the top level
configure.ac:2756: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2756: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2756: the top level
configure.ac:2757: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2757: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2757: the top level
configure.ac:2850: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2850: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2850: the top level
configure.ac:2851: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2851: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2851: the top level
configure.ac:2857: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2857: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2857: the top level
configure.ac:2858: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2858: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2858: the top level
configure.ac:2863: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2863: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2863: the top level
configure.ac:2864: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:2864: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:2864: the top level
configure.ac:3044: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3044: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3044: the top level
configure.ac:3045: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3045: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3045: the top level
configure.ac:3123: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3123: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3123: the top level
configure.ac:3124: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3124: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3124: the top level
configure.ac:3175: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3175: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3175: the top level
configure.ac:3176: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3176: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3176: the top level
configure.ac:3253: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3253: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3253: the top level
configure.ac:3254: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3254: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3254: the top level
configure.ac:3388: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3388: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3388: the top level
configure.ac:3389: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3389: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3389: the top level
configure.ac:3475: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3475: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3475: the top level
configure.ac:3476: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3476: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3476: the top level
configure.ac:3674: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3674: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3674: the top level
configure.ac:3675: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3675: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3675: the top level
configure.ac:3765: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3765: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3765: the top level
configure.ac:3766: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3766: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3766: the top level
configure.ac:3849: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3849: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3849: the top level
configure.ac:3850: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3850: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3850: the top level
configure.ac:3874: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3874: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3874: the top level
configure.ac:3875: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:3875: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:3875: the top level
configure.ac:3903: warning: The macro `AC_HEADER_STDC' is obsolete.
configure.ac:3903: You should run autoupdate.
./lib/autoconf/headers.m4:704: AC_HEADER_STDC is expanded from...
configure.ac:3903: the top level
configure.ac:3990: warning: The macro `AC_HEADER_TIME' is obsolete.
configure.ac:3990: You should run autoupdate.
./lib/autoconf/headers.m4:743: AC_HEADER_TIME is expanded from...
configure.ac:3990: the top level
configure.ac:4105: warning: The macro `AC_TYPE_SIGNAL' is obsolete.
configure.ac:4105: You should run autoupdate.
./lib/autoconf/types.m4:776: AC_TYPE_SIGNAL is expanded from...
configure.ac:4105: the top level
configure.ac:4285: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4285: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:32: CURL_CHECK_OPTION_THREADED_RESOLVER is expanded from...
configure.ac:4285: the top level
configure.ac:4293: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4293: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4293: the top level
configure.ac:4295: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4295: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4295: the top level
configure.ac:4394: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4394: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4394: the top level
configure.ac:4395: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4395: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4395: the top level
configure.ac:4413: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4413: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4413: the top level
configure.ac:4414: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4414: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4414: the top level
configure.ac:4449: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4449: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4449: the top level
configure.ac:4450: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4450: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4450: the top level
configure.ac:4463: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4463: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
m4/curl-confopts.m4:599: CURL_CHECK_OPTION_NTLM_WB is expanded from...
configure.ac:4463: the top level
configure.ac:4472: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4472: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4472: the top level
configure.ac:4473: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4473: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4473: the top level
configure.ac:4498: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4498: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4498: the top level
configure.ac:4499: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4499: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4499: the top level
configure.ac:4531: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4531: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4531: the top level
configure.ac:4532: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4532: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4532: the top level
configure.ac:4549: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4549: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4549: the top level
configure.ac:4550: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4550: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4550: the top level
configure.ac:4567: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4567: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4567: the top level
configure.ac:4568: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4568: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4568: the top level
configure.ac:4585: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4585: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4585: the top level
configure.ac:4586: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4586: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4586: the top level
configure.ac:4603: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4603: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4603: the top level
configure.ac:4604: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4604: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4604: the top level
configure.ac:4621: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4621: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4621: the top level
configure.ac:4622: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4622: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4622: the top level
configure.ac:4639: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4639: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4639: the top level
configure.ac:4640: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4640: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4640: the top level
configure.ac:4657: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4657: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4657: the top level
configure.ac:4658: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4658: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4658: the top level
configure.ac:4676: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4676: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4676: the top level
configure.ac:4677: warning: The macro `AC_HELP_STRING' is obsolete.
configure.ac:4677: You should run autoupdate.
./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from...
configure.ac:4677: the top level
configure.ac:120: installing './compile'
configure.ac:179: installing './config.guess'
configure.ac:179: installing './config.sub'
configure.ac:120: installing './install-sh'
configure.ac:125: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs

[TIMEOUT]

Commit Diff GitHub →

lib/conncache.c +6 -0lib/easy.c +0 -17lib/http2.c +6 -3lib/multi.c +21 -1lib/setopt.c +1 -1lib/transfer.c +7 -7lib/url.c +9 -23lib/urldata.h +0 -1tests/data/test509 +1 -4tests/libtest/lib509.c +15 -48
lib/conncache.c+6 -0
@@ -531,6 +531,11 @@ Curl_conncache_extract_oldest(struct Curl_easy *data)
void Curl_conncache_close_all_connections(struct conncache *connc)
{
struct connectdata *conn;
+ char buffer[READBUFFER_MIN];
+ if(!connc->closure_handle)
+ return;
+ connc->closure_handle->state.buffer = buffer;
+ connc->closure_handle->set.buffer_size = READBUFFER_MIN;
conn = conncache_find_first_connection(connc);
while(conn) {
@@ -547,6 +552,7 @@ void Curl_conncache_close_all_connections(struct conncache *connc)
conn = conncache_find_first_connection(connc);
}
+ connc->closure_handle->state.buffer = NULL;
if(connc->closure_handle) {
SIGPIPE_VARIABLE(pipe_st);
sigpipe_ignore(connc->closure_handle, &pipe_st);
lib/easy.c+0 -17
@@ -829,9 +829,6 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
* the likeliness of us forgetting to init a buffer here in the future.
*/
outcurl->set.buffer_size = data->set.buffer_size;
- outcurl->state.buffer = malloc(outcurl->set.buffer_size + 1);
- if(!outcurl->state.buffer)
- goto fail;
/* copy all userdefined values */
if(dupset(outcurl, data))
@@ -947,8 +944,6 @@ struct Curl_easy *curl_easy_duphandle(struct Curl_easy *data)
*/
void curl_easy_reset(struct Curl_easy *data)
{
- long old_buffer_size = data->set.buffer_size;
-
Curl_free_request_state(data);
/* zero out UserDefined data: */
@@ -972,18 +967,6 @@ void curl_easy_reset(struct Curl_easy *data)
#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_CRYPTO_AUTH)
Curl_http_auth_cleanup_digest(data);
#endif
-
- /* resize receive buffer */
- if(old_buffer_size != data->set.buffer_size) {
- char *newbuff = realloc(data->state.buffer, data->set.buffer_size + 1);
- if(!newbuff) {
- DEBUGF(fprintf(stderr, "Error: realloc of buffer failed\n"));
- /* nothing we can do here except use the old size */
- data->set.buffer_size = old_buffer_size;
- }
- else
- data->state.buffer = newbuff;
- }
}
/*
lib/http2.c+6 -3
@@ -258,15 +258,14 @@ static unsigned int http2_conncheck(struct connectdata *check,
void Curl_http2_setup_req(struct Curl_easy *data)
{
struct HTTP *http = data->req.protop;
-
http->bodystarted = FALSE;
http->status_code = -1;
http->pausedata = NULL;
http->pauselen = 0;
http->closed = FALSE;
http->close_handled = FALSE;
- http->mem = data->state.buffer;
- http->len = data->set.buffer_size;
+ http->mem = NULL;
+ http->len = 0;
http->memlen = 0;
}
@@ -2103,6 +2102,8 @@ CURLcode Curl_http2_setup(struct connectdata *conn)
struct http_conn *httpc = &conn->proto.httpc;
struct HTTP *stream = conn->data->req.protop;
+ DEBUGASSERT(conn->data->state.buffer);
+
stream->stream_id = -1;
Curl_dyn_init(&stream->header_recvbuf, DYN_H2_HEADERS);
@@ -2126,6 +2127,8 @@ CURLcode Curl_http2_setup(struct connectdata *conn)
stream->upload_left = 0;
stream->upload_mem = NULL;
stream->upload_len = 0;
+ stream->mem = conn->data->state.buffer;
+ stream->len = conn->data->set.buffer_size;
httpc->inbuflen = 0;
httpc->nread_inbuf = 0;
lib/multi.c+21 -1
@@ -678,6 +678,7 @@ static CURLcode multi_done(struct Curl_easy *data,
data->state.lastconnect = NULL;
}
+ Curl_safefree(data->state.buffer);
Curl_free_request_state(data);
return result;
}
@@ -1522,6 +1523,20 @@ static CURLcode protocol_connect(struct connectdata *conn,
return result; /* pass back status */
}
+/*
+ * preconnect() is called immediately before a connect starts. When a redirect
+ * is followed, this is then called multiple times during a single transfer.
+ */
+static CURLcode preconnect(struct Curl_easy *data)
+{
+ if(!data->state.buffer) {
+ data->state.buffer = malloc(data->set.buffer_size + 1);
+ if(!data->state.buffer)
+ return CURLE_OUT_OF_MEMORY;
+ }
+ return CURLE_OK;
+}
+
static CURLMcode multi_runsingle(struct Curl_multi *multi,
struct curltime now,
@@ -1629,6 +1644,11 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
case CURLM_STATE_CONNECT:
/* Connect. We want to get a connection identifier filled in. */
+ /* init this transfer. */
+ result = preconnect(data);
+ if(result)
+ break;
+
Curl_pgrsTime(data, TIMER_STARTSINGLE);
if(data->set.timeout)
Curl_expire(data, data->set.timeout, EXPIRE_TIMEOUT);
@@ -2058,7 +2078,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
char *newurl = NULL;
bool retry = FALSE;
bool comeback = FALSE;
-
+ DEBUGASSERT(data->state.buffer);
/* check if over send speed */
send_timeout_ms = 0;
if(data->set.max_send_speed > 0)
lib/setopt.c+1 -1
@@ -2076,7 +2076,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
arg = READBUFFER_MIN;
/* Resize if new size */
- if(arg != data->set.buffer_size) {
+ if((arg != data->set.buffer_size) && data->state.buffer) {
char *newbuff = realloc(data->state.buffer, arg + 1);
if(!newbuff) {
DEBUGF(fprintf(stderr, "Error: realloc of buffer failed\n"));
lib/transfer.c+7 -7
@@ -558,6 +558,8 @@ static CURLcode readwrite_data(struct Curl_easy *data,
size_t excess = 0; /* excess bytes read */
bool readmore = FALSE; /* used by RTP to signal for more data */
int maxloops = 100;
+ char *buf = data->state.buffer;
+ DEBUGASSERT(buf);
*done = FALSE;
*comeback = FALSE;
@@ -592,7 +594,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
if(bytestoread) {
/* receive data from the network! */
- result = Curl_read(conn, conn->sockfd, k->buf, bytestoread, &nread);
+ result = Curl_read(conn, conn->sockfd, buf, bytestoread, &nread);
/* read would've blocked */
if(CURLE_AGAIN == result)
@@ -619,9 +621,8 @@ static CURLcode readwrite_data(struct Curl_easy *data,
/* indicates data of zero size, i.e. empty file */
is_empty_data = ((nread == 0) && (k->bodywrites == 0)) ? TRUE : FALSE;
- /* NUL terminate, allowing string ops to be used */
if(0 < nread || is_empty_data) {
- k->buf[nread] = 0;
+ buf[nread] = 0;
}
else {
/* if we receive 0 or less here, either the http2 stream is closed or the
@@ -638,7 +639,7 @@ static CURLcode readwrite_data(struct Curl_easy *data,
/* Default buffer to use when we write the buffer, it may be changed
in the flow below before the actual storing is done. */
- k->str = k->buf;
+ k->str = buf;
if(conn->handler->readwrite) {
result = conn->handler->readwrite(data, conn, &nread, &readmore);
@@ -905,10 +906,10 @@ static CURLcode readwrite_data(struct Curl_easy *data,
/* Parse the excess data */
k->str += nread;
- if(&k->str[excess] > &k->buf[data->set.buffer_size]) {
+ if(&k->str[excess] > &buf[data->set.buffer_size]) {
/* the excess amount was too excessive(!), make sure
it doesn't read out of buffer */
- excess = &k->buf[data->set.buffer_size] - k->str;
+ excess = &buf[data->set.buffer_size] - k->str;
}
nread = (ssize_t)excess;
@@ -1467,7 +1468,6 @@ CURLcode Curl_pretransfer(struct Curl_easy *data)
data->state.authhost.want = data->set.httpauth;
data->state.authproxy.want = data->set.proxyauth;
Curl_safefree(data->info.wouldredirect);
- data->info.wouldredirect = NULL;
if(data->set.httpreq == HTTPREQ_PUT)
data->state.infilesize = data->set.filesize;
lib/url.c+9 -23
@@ -610,31 +610,21 @@ CURLcode Curl_open(struct Curl_easy **curl)
return result;
}
- /* We do some initial setup here, all those fields that can't be just 0 */
-
- data->state.buffer = malloc(READBUFFER_SIZE + 1);
- if(!data->state.buffer) {
- DEBUGF(fprintf(stderr, "Error: malloc of buffer failed\n"));
- result = CURLE_OUT_OF_MEMORY;
- }
- else {
- result = Curl_init_userdefined(data);
- if(!result) {
- Curl_dyn_init(&data->state.headerb, CURL_MAX_HTTP_HEADER);
- Curl_convert_init(data);
- Curl_initinfo(data);
+ result = Curl_init_userdefined(data);
+ if(!result) {
+ Curl_dyn_init(&data->state.headerb, CURL_MAX_HTTP_HEADER);
+ Curl_convert_init(data);
+ Curl_initinfo(data);
- /* most recent connection is not yet defined */
- data->state.lastconnect = NULL;
+ /* most recent connection is not yet defined */
+ data->state.lastconnect = NULL;
- data->progress.flags |= PGRS_HIDE;
- data->state.current_speed = -1; /* init to negative == impossible */
- }
+ data->progress.flags |= PGRS_HIDE;
+ data->state.current_speed = -1; /* init to negative == impossible */
}
if(result) {
Curl_resolver_cleanup(data->state.resolver);
- free(data->state.buffer);
Curl_dyn_free(&data->state.headerb);
Curl_freeset(data);
free(data);
@@ -3973,14 +3963,10 @@ CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn)
k->start = Curl_now(); /* start time */
k->now = k->start; /* current time is now */
k->header = TRUE; /* assume header */
-
k->bytecount = 0;
-
- k->buf = data->state.buffer;
k->ignorebody = FALSE;
Curl_speedinit(data);
-
Curl_pgrsSetUploadCounter(data, 0);
Curl_pgrsSetDownloadCounter(data, 0);
lib/urldata.h+0 -1
@@ -627,7 +627,6 @@ struct SingleRequest {
struct contenc_writer *writer_stack;
time_t timeofdoc;
long bodywrites;
- char *buf;
int keepon;
char *location; /* This points to an allocated version of the Location:
header data */
tests/data/test509+1 -4
@@ -34,10 +34,7 @@ nothing
# Verify data after the test has been "shot"
<verify>
<stdout>
-seen custom_calloc()
-seen custom_malloc()
-seen custom_realloc()
-seen custom_free()
+Callbacks were invoked!
</stdout>
</verify>
tests/libtest/lib509.c+15 -48
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <[email protected]>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <[email protected]>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -34,70 +34,35 @@
* memory callbacks which should be calling 'the real thing'.
*/
-/*
-#include "memdebug.h"
-*/
-
-static int seen_malloc = 0;
-static int seen_free = 0;
-static int seen_realloc = 0;
-static int seen_strdup = 0;
-static int seen_calloc = 0;
-
-void *custom_malloc(size_t size);
-void custom_free(void *ptr);
-void *custom_realloc(void *ptr, size_t size);
-char *custom_strdup(const char *ptr);
-void *custom_calloc(size_t nmemb, size_t size);
+static int seen;
-
-void *custom_calloc(size_t nmemb, size_t size)
+static void *custom_calloc(size_t nmemb, size_t size)
{
- if(!seen_calloc) {
- printf("seen custom_calloc()\n");
- seen_calloc = 1;
- }
+ seen++;
return (calloc)(nmemb, size);
}
-void *custom_malloc(size_t size)
+static void *custom_malloc(size_t size)
{
- if(!seen_malloc && seen_calloc) {
- printf("seen custom_malloc()\n");
- seen_malloc = 1;
- }
+ seen++;
return (malloc)(size);
}
-char *custom_strdup(const char *ptr)
+static char *custom_strdup(const char *ptr)
{
- if(!seen_strdup && seen_malloc) {
- /* currently (2013.03.13), memory tracking enabled builds do not call
- the strdup callback, in this case malloc callback and memcpy are used
- instead. If some day this is changed the following printf() should be
- uncommented, and a line added to test definition.
- printf("seen custom_strdup()\n");
- */
- seen_strdup = 1;
- }
+ seen++;
return (strdup)(ptr);
}
-void *custom_realloc(void *ptr, size_t size)
+static void *custom_realloc(void *ptr, size_t size)
{
- if(!seen_realloc && seen_malloc) {
- printf("seen custom_realloc()\n");
- seen_realloc = 1;
- }
+ seen++;
return (realloc)(ptr, size);
}
-void custom_free(void *ptr)
+static void custom_free(void *ptr)
{
- if(!seen_free && seen_realloc) {
- printf("seen custom_free()\n");
- seen_free = 1;
- }
+ seen++;
(free)(ptr);
}
@@ -110,7 +75,6 @@ int test(char *URL)
CURL *curl;
int asize;
char *str = NULL;
-
(void)URL;
res = curl_global_init_mem(CURL_GLOBAL_ALL,
@@ -136,6 +100,9 @@ int test(char *URL)
asize = (int)sizeof(a);
str = curl_easy_escape(curl, (char *)a, asize); /* uses realloc() */
+ if(seen)
+ printf("Callbacks were invoked!\n");
+
test_cleanup:
if(str)