[axel-commits] r63 - /branches/2.x/CHANGES /branches/2.x/axel.c /branches/2.x/axel.h /trunk/CHANGES /trunk/axel.c

[phihag-guest at users.alioth.debian.org]

Author: phihag-guest
Date: Wed Nov 19 10:50:58 2008
New Revision: 63

URL: http://svn.debian.org/wsvn/axel/?sc=1&rev=63
Log:
Fix #311255


Modified:
    branches/2.x/CHANGES
    branches/2.x/axel.c
    branches/2.x/axel.h
    trunk/CHANGES
    trunk/axel.c

Modified: branches/2.x/CHANGES
URL: http://svn.debian.org/wsvn/axel/branches/2.x/CHANGES?rev=63&op=diff
==============================================================================
--- branches/2.x/CHANGES (original)
+++ branches/2.x/CHANGES Wed Nov 19 10:50:58 2008
@@ -1,3 +1,7 @@
+Version 2.2.1:
+
+- Wait for thread termination in axel.c:axel_do (Closes: #311255), thanks John Ripa
+
 Version 2.2:
 
 - Fix a buffer overflow in http.c:http_encode.

Modified: branches/2.x/axel.c
URL: http://svn.debian.org/wsvn/axel/branches/2.x/axel.c?rev=63&op=diff
==============================================================================
--- branches/2.x/axel.c (original)
+++ branches/2.x/axel.c Wed Nov 19 10:50:58 2008
@@ -386,7 +386,10 @@
 		if( !axel->conn[i].enabled && axel->conn[i].currentbyte < axel->conn[i].lastbyte )
 		{
 			if( axel->conn[i].state == 0 )
-			{
+			{	
+				// Wait for termination of this thread
+				pthread_join(axel->conn[i].setup_thread, NULL);
+				
 				conn_set( &axel->conn[i], axel->url->text );
 				axel->url = axel->url->next;
 				/* axel->conn[i].local_if = axel->conf->interfaces->text;

Modified: branches/2.x/axel.h
URL: http://svn.debian.org/wsvn/axel/branches/2.x/axel.h?rev=63&op=diff
==============================================================================
--- branches/2.x/axel.h (original)
+++ branches/2.x/axel.h Wed Nov 19 10:50:58 2008
@@ -67,7 +67,7 @@
 #define MAX_STRING		1024
 #define MAX_ADD_HEADERS	10
 #define MAX_REDIR		5
-#define AXEL_VERSION_STRING	"2.2"
+#define AXEL_VERSION_STRING	"2.2.1"
 #define USER_AGENT		"Axel " AXEL_VERSION_STRING " (" ARCH ")"
 
 typedef struct

Modified: trunk/CHANGES
URL: http://svn.debian.org/wsvn/axel/trunk/CHANGES?rev=63&op=diff
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Wed Nov 19 10:50:58 2008
@@ -1,3 +1,7 @@
+Version 2.2.1:
+
+- Wait for thread termination in axel.c:axel_do (Closes: #311255), thanks John Ripa
+
 Version 2.2:
 
 - Fix a buffer overflow in http.c:http_encode.

Modified: trunk/axel.c
URL: http://svn.debian.org/wsvn/axel/trunk/axel.c?rev=63&op=diff
==============================================================================
--- trunk/axel.c (original)
+++ trunk/axel.c Wed Nov 19 10:50:58 2008
@@ -386,7 +386,10 @@
 		if( !axel->conn[i].enabled && axel->conn[i].currentbyte < axel->conn[i].lastbyte )
 		{
 			if( axel->conn[i].state == 0 )
-			{
+			{	
+				// Wait for termination of this thread
+				pthread_join(axel->conn[i].setup_thread, NULL);
+				
 				conn_set( &axel->conn[i], axel->url->text );
 				axel->url = axel->url->next;
 				/* axel->conn[i].local_if = axel->conf->interfaces->text;