Commit f6f214df authored by Kartik Mistry's avatar Kartik Mistry 🇮🇳

New upstream version 1.31.0

parent e7941ac9
......@@ -20,6 +20,7 @@ Fredrik Fornwall
ITriskTI
Igor Khomyakov
Jarda Snajdr
JimmyZ
Juan Francisco Cantero Hurtado
Kcchouette
Kurt Kartaltepe
......
This diff is collapsed.
......@@ -28,15 +28,15 @@ RUN apt-get update && \
pkg-config git curl dpkg-dev gcc-mingw-w64 \
autopoint libcppunit-dev libxml2-dev libgcrypt11-dev lzip
RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.1.1.tar.lz && \
RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.1.2.tar.lz && \
curl -L -O http://downloads.sourceforge.net/project/expat/expat/2.2.0/expat-2.2.0.tar.bz2 && \
curl -L -O https://www.sqlite.org/2016/sqlite-autoconf-3150200.tar.gz && \
curl -L -O http://zlib.net/zlib-1.2.8.tar.xz && \
curl -L -O https://www.sqlite.org/2017/sqlite-autoconf-3160200.tar.gz && \
curl -L -O http://zlib.net/zlib-1.2.11.tar.gz && \
curl -L -O https://c-ares.haxx.se/download/c-ares-1.12.0.tar.gz && \
curl -L -O http://libssh2.org/download/libssh2-1.8.0.tar.gz
RUN tar xf gmp-6.1.1.tar.lz && \
cd gmp-6.1.1 && \
RUN tar xf gmp-6.1.2.tar.lz && \
cd gmp-6.1.2 && \
./configure \
--disable-shared \
--enable-static \
......@@ -57,8 +57,8 @@ RUN tar xf expat-2.2.0.tar.bz2 && \
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` && \
make install
RUN tar xf sqlite-autoconf-3150200.tar.gz && \
cd sqlite-autoconf-3150200 && \
RUN tar xf sqlite-autoconf-3160200.tar.gz && \
cd sqlite-autoconf-3160200 && \
./configure \
--disable-shared \
--enable-static \
......@@ -67,8 +67,8 @@ RUN tar xf sqlite-autoconf-3150200.tar.gz && \
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` && \
make install
RUN tar xf zlib-1.2.8.tar.xz && \
cd zlib-1.2.8 && \
RUN tar xf zlib-1.2.11.tar.gz && \
cd zlib-1.2.11 && \
CC=$HOST-gcc \
AR=$HOST-ar \
LD=$HOST-ld \
......
aria2 1.30.0
aria2 1.31.0
============
Release Note
------------
This release fixes several bugs. See Changes below for detailed bug
fixes. This release adds an ability to expand `${HOME}` to user's
home directory in several options. It would be useful when used in
configuration file. -S option against torrent file now prints out DHT
nodes.
This release fixes assertion error in
SimpleRandomizer::getRandomBytes. It adds new option
content-disposition-default-utf8.
Changes
-------
* mingw: Use sqlite 3.15.2
* Better error message when local file status cannot be retrieved
* Fix bug that --disable-websocket causes build error
GH-836
* Fix bug that lower bound of optimize-concurrent-downloads becomes 1
* Fix assertion failure in SimpleRandomizer::getRandomBytes
GH-798
errno might not be initialized to 0, and we may get both rv == -1
and errno != ENOSYS. This leads to assertion failure. Since
getrandom_linux always returns -1 on failure, checking errno is
useless in this function.
* Print DHT nodes with -S option
GH-823
GH-795
* Add option content-disposition-default-utf8
* Take into account address family when resolving DHT node address
Patch from JimmyZ
GH-794
* Allow block device file to -i option
GH-785
* Expand `${HOME}` to user's home directory in several options
The following options implement this substitution:
* --ca-certificate
* --certificate
* --dht-file-path
* --dht-file-path6
* --dir
* --input-file
* --load-cookies
* --log
* --metalink-file
* --netrc-path
* --on-bt-download-complete
* --on-download-complete
* --on-download-error
* --on-download-start
* --on-download-stop
* --on-download_pause
* --out
* --private-key
* --rpc-certificate
* --rpc-private-key
* --save-cookies
* --save-session
* --server-stat-if
* --server-stat-of
* --torrent-file
GH-780
* Document that libaria2 is not thread safe
GH-775
* configure: Use pkg-config to find libs whenever possible
Use pkg-config to find cppunit, libxml2 and expat. All those
libraries provide pkg-config files, and in all of those cases the
pkg-config macro is superior to the custom macros used currently.
The advantages of pkg-config files include:
- Explicit static linking support via --static. Currently, e.g.
'xml2-config --libs' prints all libraries needed for static
linking when doing dynamic linking unnecessary, resulting in
unnecessary direct deps.
- Better cross-build support. You don't have to build the additional
*-config tools for target.
- Better multilib support. Per-ABI pkgconfig directories are
commonly supported while packages usually fail to look for
per-CHOST *-config variants.
- Better override support. The current macros allow little to no
result overrides, the pkg-config macros let you pass FOO_CFLAGS
and FOO_LIBS manually.
- Cleaner version checks. The code used in libxml.m4 is really
creepy.
Patch from Michał Górny
GH-773
* WinTLS: Rewrite writeData
We re-wrote WinTLSSession::writeData. The major points are:
* Buffer is now preallocated once handshake is finished.
Previously, they are allocated each time when we send one TLS
record.
* Schannel uses header, body and trailer for each secBuffer. Now we
send them off at once using WSASend which is windows counterpart
of sendv. Previously, we do memmove if some of them are
truncated.
* We don't try to send application data in
WinTLSSession::closeConnection, since semantically we need same
application data used to create TLS record before. Using 0 length
data to finish sending buffered data looks like a hack.
GH-772
GH-813
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for aria2 1.30.0.
# Generated by GNU Autoconf 2.69 for aria2 1.31.0.
#
# Report bugs to <https://github.com/aria2/aria2/issues>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='aria2'
PACKAGE_TARNAME='aria2'
PACKAGE_VERSION='1.30.0'
PACKAGE_STRING='aria2 1.30.0'
PACKAGE_VERSION='1.31.0'
PACKAGE_STRING='aria2 1.31.0'
PACKAGE_BUGREPORT='https://github.com/aria2/aria2/issues'
PACKAGE_URL='https://aria2.github.io/'
......@@ -1592,7 +1592,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures aria2 1.30.0 to adapt to many kinds of systems.
\`configure' configures aria2 1.31.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1664,7 +1664,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of aria2 1.30.0:";;
short | recursive ) echo "Configuration of aria2 1.31.0:";;
esac
cat <<\_ACEOF
......@@ -1877,7 +1877,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
aria2 configure 1.30.0
aria2 configure 1.31.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2839,7 +2839,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by aria2 $as_me 1.30.0, which was
It was created by aria2 $as_me 1.31.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -3818,7 +3818,7 @@ fi
# Define the identity of the package.
PACKAGE='aria2'
VERSION='1.30.0'
VERSION='1.31.0'
cat >>confdefs.h <<_ACEOF
......@@ -27148,7 +27148,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by aria2 $as_me 1.30.0, which was
This file was extended by aria2 $as_me 1.31.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -27215,7 +27215,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
aria2 config.status 1.30.0
aria2 config.status 1.31.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
#
AC_PREREQ([2.67])
AC_INIT([aria2],[1.30.0],[https://github.com/aria2/aria2/issues],[aria2],[https://aria2.github.io/])
AC_INIT([aria2],[1.31.0],[https://github.com/aria2/aria2/issues],[aria2],[https://aria2.github.io/])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
......
This diff is collapsed.
.\" Man page generated from reStructuredText.
.
.TH "ARIA2C" "1" "Dec 15, 2016" "1.30.0" "aria2"
.TH "ARIA2C" "1" "Jan 16, 2017" "1.31.0" "aria2"
.SH NAME
aria2c \- The ultra fast download utility
.
......@@ -1453,6 +1453,13 @@ Set log level to output to console. LEVEL is either \fBdebug\fP,
.UNINDENT
.INDENT 0.0
.TP
.B \-\-content\-disposition\-default\-utf8[=true|false]
Handle quoted string in Content\-Disposition header as UTF\-8 instead
of ISO\-8859\-1, for example, the filename parameter, but not the
extended version filename*. Default: \fBfalse\fP
.UNINDENT
.INDENT 0.0
.TP
.B \-D, \-\-daemon[=true|false]
Run as daemon. The current working directory will be changed to \fB/\fP
and standard input, standard output and standard error will be
......@@ -2490,6 +2497,8 @@ of URIs. These optional lines must start with white space(s).
.IP \(bu 2
\fI\%connect\-timeout\fP
.IP \(bu 2
\fI\%content\-disposition\-default\-utf8\fP
.IP \(bu 2
\fI\%continue\fP
.IP \(bu 2
\fI\%dir\fP
......
......@@ -1211,6 +1211,12 @@ Advanced Options
Set log level to output to console. LEVEL is either ``debug``,
``info``, ``notice``, ``warn`` or ``error``. Default: ``notice``
.. option:: --content-disposition-default-utf8[=true|false]
Handle quoted string in Content-Disposition header as UTF-8 instead
of ISO-8859-1, for example, the filename parameter, but not the
extended version filename*. Default: ``false``
.. option:: -D, --daemon[=true|false]
Run as daemon. The current working directory will be changed to ``/``
......@@ -2104,6 +2110,7 @@ of URIs. These optional lines must start with white space(s).
* :option:`checksum <--checksum>`
* :option:`conditional-get <--conditional-get>`
* :option:`connect-timeout <--connect-timeout>`
* :option:`content-disposition-default-utf8 <--content-disposition-default-utf8>`
* :option:`continue <-c>`
* :option:`dir <-d>`
* :option:`dry-run <--dry-run>`
......
.\" Man page generated from reStructuredText.
.
.TH "ARIA2C" "1" "dez 15, 2016" "1.30.0" "aria2"
.TH "ARIA2C" "1" "jan 16, 2017" "1.31.0" "aria2"
.SH NAME
aria2c \- Utilitário para download super ultra rápido
.
......
.\" -*- mode: troff; coding: utf-8 -*-
.\" Man page generated from reStructuredText.
.
.TH "ARIA2C" "1" "дек. 15, 2016" "1.30.0" "aria2"
.TH "ARIA2C" "1" "янв. 16, 2017" "1.31.0" "aria2"
.SH NAME
aria2c \- сверхбыстрая утилита загрузки
.
......@@ -1394,7 +1394,7 @@ PKCS12\-файлы должны содержать сертификат, клю
Если параметр задан как false, то загрузки, добавленные с помощью
\fI\%aria2.addTorrent()\fP или \fI\%aria2.addMetalink()\fP, не будут
сохраняться при помощи параметра \fI\%\-\-save\-session\fP\&.
По умолчанию: \fBfalse\fP
По умолчанию: \fBtrue\fP
.UNINDENT
.INDENT 0.0
.TP
......@@ -1525,6 +1525,13 @@ URI, если \fI\%\-\-out\fP не указан. Для перезаписи
.UNINDENT
.INDENT 0.0
.TP
.B \-\-content\-disposition\-default\-utf8[=true|false]
Обрабатывать строку в кавычках в заголовке Content\-Disposition как
UTF\-8 вместо ISO\-8859\-1, например, параметр filename,
но не расширенную версию filename*. По умолчанию: \fBfalse\fP
.UNINDENT
.INDENT 0.0
.TP
.B \-D, \-\-daemon[=true|false]
Запустить как демон (фоновый процесс). Текущий рабочий каталог
будет заменен на \fB/\fP, а стандартный ввод, стандартный вывод,
......@@ -2600,6 +2607,8 @@ URI. Эти дополнительные строки должны начина
.IP \(bu 2
\fI\%connect\-timeout\fP
.IP \(bu 2
\fI\%content\-disposition\-default\-utf8\fP
.IP \(bu 2
\fI\%continue\fP
.IP \(bu 2
\fI\%dir\fP
......
......@@ -1168,7 +1168,7 @@ HTTP(S)/FTP, они тут же могут выгружаться в BitTorrent-
Если параметр задан как false, то загрузки, добавленные с помощью
:func:`aria2.addTorrent` или :func:`aria2.addMetalink`, не будут
сохраняться при помощи параметра :option:`--save-session`.
По умолчанию: ``false``
По умолчанию: ``true``
.. option:: --rpc-secret=<TOKEN>
......@@ -1282,6 +1282,12 @@ HTTP(S)/FTP, они тут же могут выгружаться в BitTorrent-
быть: ``debug``, ``info``, ``notice``, ``warn`` или ``error``.
По умолчанию: ``notice``
.. option:: --content-disposition-default-utf8[=true|false]
Обрабатывать строку в кавычках в заголовке Content-Disposition как
UTF-8 вместо ISO-8859-1, например, параметр filename,
но не расширенную версию filename*. По умолчанию: ``false``
.. option:: -D, --daemon[=true|false]
Запустить как демон (фоновый процесс). Текущий рабочий каталог
......@@ -2214,6 +2220,7 @@ URI. Эти дополнительные строки должны начина
* :option:`checksum <--checksum>`
* :option:`conditional-get <--conditional-get>`
* :option:`connect-timeout <--connect-timeout>`
* :option:`content-disposition-default-utf8 <--content-disposition-default-utf8>`
* :option:`continue <-c>`
* :option:`dir <-d>`
* :option:`dry-run <--dry-run>`
......
No preview for this file type
This diff is collapsed.
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
No preview for this file type
This diff is collapsed.
......@@ -151,7 +151,9 @@ void BtPieceMessage::doReceivedAction()
}
}
size_t BtPieceMessage::MESSAGE_HEADER_LENGTH = 13;
namespace {
constexpr size_t MESSAGE_HEADER_LENGTH = 13;
} // namespace
void BtPieceMessage::createMessageHeader(unsigned char* msgHeader) const
{
......
......@@ -52,8 +52,6 @@ private:
DownloadContext* downloadContext_;
PeerStorage* peerStorage_;
static size_t MESSAGE_HEADER_LENGTH;
bool checkPieceHash(const std::shared_ptr<Piece>& piece);
void onNewPiece(const std::shared_ptr<Piece>& piece);
......
......@@ -42,7 +42,7 @@
namespace aria2 {
ContentTypeRequestGroupCriteria::ContentTypeRequestGroupCriteria(
const char** contentTypes, const char** extensions)
const char* const* contentTypes, const char* const* extensions)
: contentTypes_(contentTypes), extensions_(extensions)
{
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment