[Red5commits] [2160] merged fix for FP beta from trunk

[jbauch]

merged fix for FP beta from trunk


Timestamp: 06/29/07 03:26:03 EST (less than one hour ago) 
Change: 2160 
Author: jbauch

Files (see diff or trac for details): 
java/server/branches/joachim_heapmem_fixes/src/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
java/server/branches/joachim_heapmem_fixes/src/org/red5/server/net/rtmpt/RTMPTHandler.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2160

Index: /java/server/branches/joachim_heapmem_fixes/src/org/red5/server/net/rtmp/RTMPMinaIoHandler.java
===================================================================
--- /java/server/branches/joachim_heapmem_fixes/src/org/red5/server/net/rtmp/RTMPMinaIoHandler.java (revision 1458)
+++ /java/server/branches/joachim_heapmem_fixes/src/org/red5/server/net/rtmp/RTMPMinaIoHandler.java (revision 2160)
@@ -85,5 +85,8 @@
 		
 		out.put((byte)0x03);
-		out.fill((byte)0x00,Constants.HANDSHAKE_SIZE);
+		// TODO: the first four bytes of the handshake reply seem to be the
+		//       server uptime - send something better here...
+		out.putInt(0x01);
+		out.fill((byte)0x00,Constants.HANDSHAKE_SIZE-4);
 		out.put(in).flip();
 		//in.release();
Index: /java/server/branches/joachim_heapmem_fixes/src/org/red5/server/net/rtmpt/RTMPTHandler.java
===================================================================
--- /java/server/branches/joachim_heapmem_fixes/src/org/red5/server/net/rtmpt/RTMPTHandler.java (revision 1082)
+++ /java/server/branches/joachim_heapmem_fixes/src/org/red5/server/net/rtmpt/RTMPTHandler.java (revision 2160)
@@ -69,5 +69,8 @@
 		
 		out.put((byte)0x03);
-		out.fill((byte)0x00,Constants.HANDSHAKE_SIZE);
+		// TODO: the first four bytes of the handshake reply seem to be the
+		//       server uptime - send something better here...
+		out.putInt(0x01);
+		out.fill((byte)0x00,Constants.HANDSHAKE_SIZE-4);
 		out.put(in).flip();
 		


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.