胡斌 / srs

12 Nov, 2014 9 commits
- Merge branch 'srs.master' · cac29806
  cac29806 浏览文件
  
  winlin authored 2014-11-12 13:48:03 +0800
- add comments about bug #197 · 55580ca9
  55580ca9 浏览文件
  
  winlin authored 2014-11-12 13:47:04 +0800
- add comments about bug #196 · d257360e
  d257360e 浏览文件
  
  winlin authored 2014-11-12 13:46:21 +0800
- Merge branch 'srs.master' · 9d5b92ae
  9d5b92ae 浏览文件
  
  winlin authored 2014-11-12 13:00:29 +0800
- fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. · 8acd143a
  8acd143a 浏览文件
  
  winlin authored 2014-11-12 12:59:53 +0800
- Merge branch 'srs.master' · 4dd4161e
  4dd4161e 浏览文件
  
  winlin authored 2014-11-12 10:28:17 +0800
- for bug #194, remove the poll, it's no-use · a6f3478a
  a6f3478a 浏览文件
  
  winlin authored 2014-11-12 10:26:48 +0800
- Merge branch 'srs.master' · 9021fea6
  9021fea6 浏览文件
  
  winlin authored 2014-11-12 10:07:21 +0800
- for bug #194, disable the srs fd poll. · bc1b5f4b
  bc1b5f4b 浏览文件
  
  winlin authored 2014-11-12 10:05:42 +0800
11 Nov, 2014 31 commits
- Merge branch 'srs.master' · 570e99a2
  570e99a2 浏览文件
  
  winlin authored 2014-11-11 18:58:53 +0800
- fix the message of config for max_connections. · 4f21e92a
  4f21e92a 浏览文件
  
  winlin authored 2014-11-11 18:49:27 +0800
- for bug #194, use play fd poll to improve performance, it works. · 21f16f3a
  21f16f3a 浏览文件
  
  winlin authored 2014-11-11 18:46:35 +0800
- for bug #194, add fds poll, just sleep to send without recv. · 164f632b
  164f632b 浏览文件
  
  winlin authored 2014-11-11 18:35:46 +0800
- for bug #194, use play fd poll, create the singleton poll · 133cc62b
  133cc62b 浏览文件
  
  winlin authored 2014-11-11 17:54:02 +0800
- Merge branch 'srs.master' · dc4de349
  dc4de349 浏览文件
  
  winlin authored 2014-11-11 17:20:35 +0800
- refine config, check the connections more precise · efc85ed6
  efc85ed6 浏览文件
  
  winlin authored 2014-11-11 17:19:56 +0800
- Revert "Revert "for bug #194, refine the config"" · de5e2d0a ...
  de5e2d0a 浏览文件
```
This reverts commit b4c1d553.
```
  winlin authored 2014-11-11 17:12:45 +0800
- Merge branch 'srs.master' · c3d98fd7
  c3d98fd7 浏览文件
  
  winlin authored 2014-11-11 17:06:49 +0800
- Revert "for bug #194, refine the config" · b4c1d553 ...
  b4c1d553 浏览文件
```
This reverts commit 2a55ae43.
```
  winlin authored 2014-11-11 17:05:36 +0800
- Revert "add srs pipe for bug #194" · e87eacd4 ...
  e87eacd4 浏览文件
```
This reverts commit f9756ea1.
```
  winlin authored 2014-11-11 17:05:25 +0800
- Revert "for bug #194, add pipe to consumer." · 73abb1a3 ...
  73abb1a3 浏览文件
```
This reverts commit 1e601a6e.
```
  winlin authored 2014-11-11 17:04:56 +0800
- Revert "for bug#194, open pipe for each connection." · 306f75b2 ...
  306f75b2 浏览文件
```
This reverts commit ade81bb2.
```
  winlin authored 2014-11-11 17:04:32 +0800
- Merge branch 'srs.master' · 0e2c8da2
  0e2c8da2 浏览文件
  
  winlin authored 2014-11-11 17:02:40 +0800
- Revert "Revert "add test file to show the max open files."" · bf5206d0 ...
  bf5206d0 浏览文件
```
This reverts commit ea70f296.
```
  winlin authored 2014-11-11 17:02:16 +0800
- Merge branch 'srs.master' · 9d012105
  9d012105 浏览文件
  
  winlin authored 2014-11-11 16:57:04 +0800
- Revert "add test file to show the max open files." · ea70f296 ...
  ea70f296 浏览文件
```
This reverts commit c8673cd5.
```
  winlin authored 2014-11-11 16:55:46 +0800
- Merge branch 'srs.master' · 02853956
  02853956 浏览文件
  
  winlin authored 2014-11-11 16:42:28 +0800
- for bug#194, open pipe for each connection. · ade81bb2
  ade81bb2 浏览文件
  
  winlin authored 2014-11-11 16:41:39 +0800
- Merge branch 'srs.master' · 0b0f6566
  0b0f6566 浏览文件
  
  winlin authored 2014-11-11 16:28:21 +0800
- for bug #194, add pipe to consumer. · 1e601a6e
  1e601a6e 浏览文件
  
  winlin authored 2014-11-11 16:27:35 +0800
- Merge branch 'srs.master' · 2ea3440a
  2ea3440a 浏览文件
  
  winlin authored 2014-11-11 16:10:32 +0800
- add srs pipe for bug #194 · f9756ea1
  f9756ea1 浏览文件
  
  winlin authored 2014-11-11 16:09:44 +0800
- Merge branch 'srs.master' · ca836cd3
  ca836cd3 浏览文件
  
  winlin authored 2014-11-11 15:38:53 +0800
- for bug #194, refine the config · 2a55ae43
  2a55ae43 浏览文件
  
  winlin authored 2014-11-11 15:38:21 +0800
- Merge branch 'srs.master' · f972f9ec
  f972f9ec 浏览文件
  
  winlin authored 2014-11-11 15:03:54 +0800
- add test file to show the max open files. · c8673cd5
  c8673cd5 浏览文件
  
  winlin authored 2014-11-11 15:02:58 +0800
- Merge branch 'srs.master' · 51f0e6d4
  51f0e6d4 浏览文件
  
  winlin authored 2014-11-11 14:42:20 +0800
- for bug #194, change server main cycle to 1s. · 36d12dd8
  36d12dd8 浏览文件
  
  winlin authored 2014-11-11 14:41:48 +0800
- for bug #194, set the server main cycle to 1s · 8cc9a11b
  8cc9a11b 浏览文件
  
  winlin authored 2014-11-11 14:38:54 +0800
- Merge branch 'srs.master' · 51f15e9b
  51f15e9b 浏览文件
  
  winlin authored 2014-11-11 13:43:36 +0800