2.1a updates: copyright year, streams description in README

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@165 400ebc74-4327-4243-bc38-086b20814532

diff --git a/ChangeLog b/ChangeLog
index 48b406564f7288ceb10c1145aec1dbfcddaa20d4..96b393361690527d6b1bff547a7b1c117483a15b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 RTMPDump
 Copyright 2008-2009 Andrej Stepanchuk; Distributed under the GPL v2
-Copyright 2009 Howard Chu
+Copyright 2009-2010 Howard Chu
 Copyright 2009 The Flvstreamer Team
 
+1 January 2010, v2.1a
+- fix socket receive timeouts for WIN32
+- add streams description to README
+
 29 December 2009, v2.1
 - AMF cleanup: bounds checking for all encoders, moved AMF_EncodeNamed* from rtmp.c
 - added SecureToken support

diff --git a/README b/README
index 82a6da3012da550b2dc4a5fd097054e0624de688..e8b134068b9bf6da5199f40af63ff9908341802c 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-RTMP Dump v2.0
+RTMP Dump v2.1a
 (C) 2009 Andrej Stepanchuk
-(C) 2009 Howard Chu
+(C) 2009-2010 Howard Chu
 License: GPLv2
 
 To compile type "make" with your platform name, e.g.
@@ -61,15 +61,19 @@ OpenSSL cross-compiling can be a difficult beast.
 Credit goes to team boxee for the XBMC RTMP code originally used in RTMPDumper.
 The current code is based on the XBMC code but rewritten in C by Howard Chu.
 
-RTMP Servers
------------
-You can also use "make rtmpsrv" to build a stub server. Note that this is
-very incomplete code, and I haven't yet decided whether or not to finish
-it. In its current form it is useful for obtaining all the parameters
-that a real Flash client would send to an RTMP server, so that they can be
-used with rtmpdump.
+Example Servers
+---------------
+Three different types of servers are also present in this distribution:
+ rtmpsrv - a stub server
+ rtmpsuck - a transparent proxy
+ streams - an RTMP to HTTP gateway
 
-You can also use "make rtmpsuck" to build a proxy server. See below...
+rtmpsrv - Note that this is very incomplete code, and I haven't yet decided
+whether or not to finish it. In its current form it is useful for obtaining
+all the parameters that a real Flash client would send to an RTMP server, so
+that they can be used with rtmpdump.
+
+rtmpsuck - proxy server. See below...
 
 All you need to do is redirect your Flash clients to the machine running this
 server and it will dump out all the connect / play parameters that the Flash
@@ -123,3 +127,14 @@ The point of all this, instead of just using a sniffer, is that since rtmpsuck
 has performed real handshakes with both the client and the server, it can
 negotiate whatever encryption keys are needed and so record the unencrypted
 data.
+
+streams - HTTP gateway: this is an HTTP server that accepts requests that
+consist of rtmpdump parameters. It then connects to the specified RTMP
+server and returns the retrieved data in the HTTP response. The only valid
+HTTP request is "GET /" but additional options can be provided in normal
+URL-encoded fashion. E.g.
+  GET /?r=rtmp:%2f%2fserver%2fmyapp&y=somefile HTTP/1.0
+
+is equivalent the rtmpdump parameters "-r rtmp://server/myapp -y somefile".
+
+Note that only the shortform (single letter) rtmpdump options are supported.

diff --git a/hashswf.c b/hashswf.c
index e03a19ff7774a15b132da6056d38f2b591496465..3994c6c46452dda85843b6c262460f5d6e224375 100644 (file)
--- a/hashswf.c
+++ b/hashswf.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2009 Howard Chu
+ *  Copyright (C) 2009-2010 Howard Chu
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/rtmp.c b/rtmp.c
index f21f986817ce0b44976fd933b3698ef7eb899ea2..f13bb9f2ed515f2642c1fe11add128a163eb4a90 100644 (file)
--- a/rtmp.c
+++ b/rtmp.c
@@ -2,7 +2,7 @@
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
  *      Copyright (C) 2008-2009 Andrej Stepanchuk
- *      Copyright (C) 2009 Howard Chu
+ *      Copyright (C) 2009-2010 Howard Chu
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

diff --git a/rtmp.h b/rtmp.h
index 61ce8e8fb1e9c4e120c1f80d94bc227b10eb4677..0e4a934ba584a2608edf1a93224b1ac4b00ebcc5 100644 (file)
--- a/rtmp.h
+++ b/rtmp.h
@@ -4,7 +4,7 @@
  *      Copyright (C) 2005-2008 Team XBMC
  *      http://www.xbmc.org
  *      Copyright (C) 2008-2009 Andrej Stepanchuk
- *      Copyright (C) 2009 Howard Chu
+ *      Copyright (C) 2009-2010 Howard Chu
  *
  *  This Program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by