- using SIGINT in externremux to kill mencoder works better than SIGTERM;

  especially x264 still needs a SIGKILL sometimes
- added --remove-destination to cp commands installing plugins
- updated Italian translation (thanks to Diego Pierotto)
- config option "client may suspend" hidden if not applicable
- updated and enhanced README
- added support for HTTP method HEAD
- rewrite of externremux.sh, including support for various URL parameters,
  logging and improved shutdown
- start externremux script in a separate process group
- changed HTTP URL path for externremux from EXTERN to EXT (suggested by
  Rolf Ahrenberg)
- HTTP headers now have to be emitted by externremux script
- pass channel related information and URL parameters to externremux script
  through environment
- implement CGI like interface for externremux script
Modified Files:
 Tag: v0_4
	CONTRIBUTORS HISTORY Makefile README common.c common.h i18n.c
	remux/extern.c remux/extern.h server/connection.c
	server/connection.h server/connectionHTTP.c
	server/connectionHTTP.h server/connectionIGMP.c
	server/connectionVTP.c server/livestreamer.c
	server/livestreamer.h server/menuHTTP.c server/setup.c
	server/setup.h server/streamer.c server/streamer.h
	streamdev/externremux.sh streamdev/streamdevhosts.conf

1 files changed, 7 insertions, 4 deletions

diff --git a/server/connection.c b/server/connection.c
index 059a63e..6bcbd1e 100644
--- a/server/connection.c
+++ b/server/connection.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: connection.c,v 1.10.2.2 2009/09/18 10:41:11 schmirl Exp $
+ *  $Id: connection.c,v 1.10.2.3 2010/07/19 13:50:14 schmirl Exp $
  */
  
 #include "server/connection.h"
@@ -27,7 +27,7 @@ cServerConnection::~cServerConnection()
 {
 }
 
-const cChannel* cServerConnection::ChannelFromString(const char *String, int *Apid) {
+const cChannel* cServerConnection::ChannelFromString(const char *String, int *Apid, int *Dpid) {
 	const cChannel *channel = NULL;
 	char *string = strdup(String);
 	char *ptr, *end;
@@ -58,7 +58,8 @@ const cChannel* cServerConnection::ChannelFromString(const char *String, int *Ap
 	}
 
 	if (channel != NULL && apididx > 0) {
-		int apid = 0, index = 1;
+		int apid = 0, dpid = 0;
+		int index = 1;
 
 		for (int i = 0; channel->Apid(i) != 0; ++i, ++index) {
 			if (index == apididx) {
@@ -70,7 +71,7 @@ const cChannel* cServerConnection::ChannelFromString(const char *String, int *Ap
 		if (apid == 0) {
 			for (int i = 0; channel->Dpid(i) != 0; ++i, ++index) {
 				if (index == apididx) {
-					apid = channel->Dpid(i);
+					dpid = channel->Dpid(i);
 					break;
 				}
 			}
@@ -78,6 +79,8 @@ const cChannel* cServerConnection::ChannelFromString(const char *String, int *Ap
 
 		if (Apid != NULL) 
 			*Apid = apid;
+		if (Dpid != NULL) 
+			*Dpid = dpid;
 	}
 
 	free(string);