Public bug reported:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
affects ubuntu/axel
subscribe ubuntu-universe-sponsors
diff -u axel-1.0b/debian/changelog axel-1.0b/debian/changelog
- --- axel-1.0b/debian/changelog
+++ axel-1.0b/debian/changelog
@@ -1,3 +1,10 @@
+axel (1.0b-1.1ubuntu1) feisty; urgency=low
+
+ * Fixed non existing thread killing
+ * Error messages were never showed (cause they were misplaced)
+
+ -- Ouattara Oumar Aziz (alias wattazoum) <[EMAIL PROTECTED]> Sun, 13 May
2007 08:04:52 +0200
+
axel (1.0b-1.1) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
- --- axel-1.0b.orig/http.c
+++ axel-1.0b/http.c
@@ -41,7 +41,8 @@
sprintf( conn->host, "%s:%i", host, port );
if( !conn_set( tconn, proxy ) )
{
- - sprintf( conn->request, _("Invalid proxy string:
%s\n"), proxy );
+ /* We'll put the message in conn->headers, not in
request */
+ sprintf( conn->headers, _("Invalid proxy string:
%s\n"), proxy );
return( 0 );
}
host = tconn->host;
@@ -55,7 +56,8 @@
if( ( conn->fd = tcp_connect( host, port, conn->local_if ) ) == -1 )
{
- - sprintf( conn->request, _("Unable to connect to server
%s:%i\n"), host, port );
+ /* We'll put the message in conn->headers, not in request */
+ sprintf( conn->headers, _("Unable to connect to server
%s:%i\n"), host, port );
return( 0 );
}
@@ -145,7 +147,8 @@
{
if( read( conn->fd, s, 1 ) <= 0 )
{
- - sprintf( conn->request, _("Connection gone.\n") );
+ /* We'll put the message in conn->headers, not in
request */
+ sprintf( conn->headers, _("Connection gone.\n") );
return( 0 );
}
if( *s == '\r' )
only in patch2:
unchanged:
- --- axel-1.0b.orig/axel.c
+++ axel-1.0b/axel.c
@@ -444,7 +444,9 @@
/* Terminate any thread still running */
for( i = 0; i < axel->conf->num_connections; i ++ )
- - pthread_cancel( *axel->conn[i].setup_thread );
+ /* don't try to kill non existing thread */
+ if ( *axel->conn[i].setup_thread != 0 )
+ pthread_cancel( *axel->conn[i].setup_thread );
/* Delete state file if necessary */
if( axel->ready == 1 )
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFGRr9b3oNqSZ7gEVoRAi4LAJsGUiHWSwGBkXy1LQz3Ft4AKDTGowCg4oAK
2IfVFoNJ03V1Hyl+/0rNbNA=
=ZoU3
-----END PGP SIGNATURE-----
** Affects: axel (Ubuntu)
Importance: Undecided
Status: Unconfirmed
--
Please sponsor axel upload
https://bugs.launchpad.net/bugs/114380
You received this bug notification because you are a member of Ubuntu
Bugs, which is the bug contact for Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
