Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2019 updates #2

Open
wants to merge 1,513 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1513 commits
Select commit Hold shift + click to select a range
402f6e8
use nginx to delivery the web
winlinvip Jul 23, 2014
394cb4b
update donation
winlinvip Jul 24, 2014
1c27f3b
refine config, warning when feature disabled.
winlinvip Jul 25, 2014
7207c2f
refine config, check all config item name.
winlinvip Jul 25, 2014
630bdf0
refine config, check the value of http api/stream.
winlinvip Jul 25, 2014
7865b0e
refine config, check chunk size.
winlinvip Jul 25, 2014
50cd1d2
refine the config
winlinvip Jul 25, 2014
b17c736
fix #124, gop cache support disable video in publishing. 0.9.171.
winlinvip Jul 26, 2014
7241fa8
fix #126, srs_publiser add warnings. refine config utest.
winlinvip Jul 26, 2014
9f2da4e
refine log, can be used when _srs_config is NULL.
winlinvip Jul 26, 2014
5f7ff37
fix the utest mock config bug
winlinvip Jul 26, 2014
ebf9e56
refine the max connections, compare the system ulimit max open files,…
winlinvip Jul 26, 2014
30ebba0
add config check utest
winlinvip Jul 26, 2014
b10d952
fix #134, not fix for the shrink to clear the queue.
winlinvip Jul 26, 2014
fbddfbc
fix #134, not fix for the shrink to clear the queue.
winlinvip Jul 26, 2014
a35d403
add utest for config check
winlinvip Jul 26, 2014
13abb0d
complete config utest. 0.9.173
winlinvip Jul 26, 2014
b19d2e8
refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp
winlinvip Jul 26, 2014
6ee9ea3
refine code, rename SrsSocket to SrsStSocket
winlinvip Jul 26, 2014
6d9d9ee
updte forwarder comments
winlinvip Jul 26, 2014
a645b40
add comments for utility, the USER_HZ for /proc/stat
winlinvip Jul 27, 2014
d0bc088
refine rtmp client, add comments for the dumps_packets()
winlinvip Jul 27, 2014
d2f125b
refine the cpu usage calc, add total_delta.
winlinvip Jul 27, 2014
02f7c85
add total system in and out KBps disk stat. 0.9.174
winlinvip Jul 27, 2014
e76036f
refine config heartbeat, add new stats. 0.9.175
winlinvip Jul 27, 2014
e5e0c4a
refine the utest, add stats
winlinvip Jul 27, 2014
abef029
refine full conf
winlinvip Jul 27, 2014
f53bfce
add udp stat to nb_conn_sys as nb_conn_sys_udp
winlinvip Jul 27, 2014
a7a0092
refine the cpu stat, use fgets and sscanf.
winlinvip Jul 27, 2014
7c1dd97
refine system stat, use fgets and sscanf.
winlinvip Jul 27, 2014
b334021
add config item for the stat disk device name
winlinvip Jul 27, 2014
df8414a
api connections add udp, add disk iops. 0.9.176
winlinvip Jul 27, 2014
ef7a02e
refine the disk io busy, can >1
winlinvip Jul 27, 2014
4f4b15f
refine the disk iops stat, get cpu info.
winlinvip Jul 27, 2014
42464cb
add disk io test command
winlinvip Jul 27, 2014
b8ae5c6
add disk io test command
winlinvip Jul 27, 2014
f4ea48a
rename network_device_index to network
winlinvip Jul 27, 2014
6f700f3
rename network_device_index to network
winlinvip Jul 27, 2014
9c11001
refine log for stats network and disk
winlinvip Jul 27, 2014
37ceadd
sync the conf file
winlinvip Jul 27, 2014
b50ecd6
Support porting srs on MacOS OSX system Platform
T-bagwell Jul 27, 2014
b198d17
Merge pull request #135 from T-bagwell/master
winlinvip Jul 27, 2014
e37f312
refine the code for ios build. add authors StevenLiu. 0.9.177
winlinvip Jul 27, 2014
118ec29
refine the code for ios build. add authors StevenLiu. 0.9.177
winlinvip Jul 27, 2014
3ff3938
Update README.md
T-bagwell Jul 28, 2014
c16d358
refine utility of cpu, add comment for cpu percent
winlinvip Jul 28, 2014
792a6f9
refine utility of cpu, add comment for cpu percent
winlinvip Jul 28, 2014
83d1e72
Merge pull request #137 from T-bagwell/master
winlinvip Jul 29, 2014
79c641e
remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178
winlinvip Jul 30, 2014
a9cd5b5
update donations
winlinvip Jul 30, 2014
b5e5dad
update donations.
winlinvip Jul 30, 2014
f0ffdcc
fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.
winlinvip Jul 31, 2014
6539ce6
fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.
winlinvip Jul 31, 2014
15d4993
slowdown the cpu usage for srs to calc connections when too many conn…
winlinvip Aug 1, 2014
f7fdbe6
update get connections thread to sleep 10ms per 1000 connectios. 0.9.181
winlinvip Aug 1, 2014
d5f0320
revert tcp stat. need more refine. 0.9.182
winlinvip Aug 1, 2014
721acc3
fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to…
winlinvip Aug 2, 2014
84450e1
fix #138, fix http hooks bug, regression bug. 0.9.184.
winlinvip Aug 2, 2014
7b24788
for bug #143, build on centos5.
winlinvip Aug 2, 2014
d5ba529
fix #143, fix retrieve sys stat bug for all linux. 0.9.185.
winlinvip Aug 3, 2014
5a95d59
fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186.
winlinvip Aug 3, 2014
6dd065b
fix #85, fix the segment-dvr sequence header missing. 0.9.187.
winlinvip Aug 3, 2014
ade2376
fix #57, use lock(acquire/release publish) to avoid duplicated publis…
winlinvip Aug 3, 2014
67403bd
fix #79, fix the reload remove edge assert bug. 0.9.189.
winlinvip Aug 3, 2014
902ae58
for 1.0 mainline7, 0.9.189, update readme.
winlinvip Aug 3, 2014
cc26339
for 1.0 mainline7, 0.9.189, update readme.
winlinvip Aug 3, 2014
b703bb0
update use nginx of ossrs.net
winlinvip Aug 3, 2014
33bc875
refine code, add comments for ossrs.net monitor.
winlinvip Aug 4, 2014
daa382f
update donations.
winlinvip Aug 4, 2014
798f913
add reload utest.
winlinvip Aug 5, 2014
3532b61
open all utest macro
winlinvip Aug 5, 2014
5b28355
fix #147, support identify the srs edge. 0.9.190.
winlinvip Aug 6, 2014
a9d2812
refine code, refine the handshake, refine the log of source_id
winlinvip Aug 6, 2014
1ebaab2
fix #148, simplify the RTMP handshake key generation. 0.9.191.
winlinvip Aug 6, 2014
156a9ed
change to 0.9.192.
winlinvip Aug 7, 2014
5f68613
Update DONATIONS.txt
winlinvip Aug 7, 2014
27698ef
Update DONATIONS.txt
winlinvip Aug 7, 2014
12ad95a
refine HMAC sha256 digest algorithm. 0.9.193
winlinvip Aug 8, 2014
69071ae
Merge branch 'master' of github.com:winlinvip/simple-rtmp-server
winlinvip Aug 8, 2014
ad2c996
refine HMAC sha256 digest algorithm. 0.9.193
winlinvip Aug 8, 2014
7adbe7f
fix utest build failed, sync with src changed.
winlinvip Aug 8, 2014
d4c2aa1
add __openssl_compute_key to calc the shared key
winlinvip Aug 8, 2014
b317abb
refine openssl, add compute_key, for bug #148
winlinvip Aug 8, 2014
0cd2b13
add rtmfp tsvarea
winlinvip Aug 8, 2014
aefcaa9
refine code, add install root message
winlinvip Aug 12, 2014
67ab0fb
add comments for openssl key generator assert.
winlinvip Aug 13, 2014
b15ee26
fix the ssl dh key size assert error, key size maybe 127, not always …
winlinvip Aug 13, 2014
08bc34e
refine wiki, cluster to forward.
winlinvip Aug 14, 2014
13d660c
update donations.
winlinvip Aug 15, 2014
2f5fa25
update donations
winlinvip Aug 15, 2014
178726a
Update DONATIONS.txt
winlinvip Aug 15, 2014
cf75048
fix reload ingest bug, remove when disabled. 0.9.196
winlinvip Aug 16, 2014
9f95d97
Merge branch 'master' of github.com:winlinvip/simple-rtmp-server
winlinvip Aug 16, 2014
8d5016f
correct the readme for OSX(darwin), donot support it well, see bug #155.
winlinvip Aug 17, 2014
5e4dad2
build openssl for osx, for bug #155.
winlinvip Aug 17, 2014
554a976
fix linux config openssl bug.
winlinvip Aug 17, 2014
3111870
for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.…
winlinvip Aug 17, 2014
6103b1c
refine options, add --with-stat. 0.9.199
winlinvip Aug 17, 2014
f03fde3
refine configre, add --with-stat to configure summary
winlinvip Aug 17, 2014
fc347a1
update configure, remove the bwtc, moved to research now.
winlinvip Aug 18, 2014
c24e68d
refine the stat, use one ok. 1.0.200
winlinvip Aug 18, 2014
e9e0cd7
fix #160, support forward/edge to flussonic, disable debug_srs_upnode…
winlinvip Aug 19, 2014
ab96565
refine forwarder, add tracable debug info. 0.9.202
winlinvip Aug 19, 2014
e656a65
for bug #162, add conf and connections limit.
winlinvip Aug 19, 2014
f549f88
for bug #162, add conf and connections limit. 0.9.203
winlinvip Aug 19, 2014
4d5414f
update log, add dsu(debug_srs_upnode), 0.9.204
winlinvip Aug 19, 2014
cc8dc0f
remove the not-supported features, add bug #163, #164.
winlinvip Aug 20, 2014
bda12e3
change plan to no-plan, for release 1.0 is feature-freezed.
winlinvip Aug 20, 2014
12d2836
Update DONATIONS.txt
winlinvip Aug 20, 2014
01ae8c4
refine the handshake random data, fill with value in [0x0f, 0xf0], 0.…
winlinvip Aug 21, 2014
5e66546
Merge branch 'master' of github.com:winlinvip/simple-rtmp-server
winlinvip Aug 21, 2014
cb311d9
fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.206.
winlinvip Aug 22, 2014
9b6187c
fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.207.
winlinvip Aug 22, 2014
42a43c6
fix #150, forward should forward the sequence header when retry. 0.9.…
winlinvip Aug 24, 2014
839101a
reorder the config functions. add comments for st to support 100k thr…
winlinvip Aug 27, 2014
d0c585a
max connections is 32756, for st use mmap default. 0.9.209
winlinvip Aug 27, 2014
5301180
add sysctl vm.max_map_count for mmap.
winlinvip Aug 27, 2014
c2ac112
amendment srs_verbose info in the get_peer_ip
zhengfl Aug 27, 2014
728b749
fix #167, add openssl includes to utest. 0.9.209.
winlinvip Aug 28, 2014
901c959
refine log, log important to file. 1.0.210
winlinvip Aug 29, 2014
cc83544
Merge pull request #172 from zhengfl/master
winlinvip Sep 4, 2014
e753a3f
add zhengfl to authors.
winlinvip Sep 4, 2014
954af2f
update donations.
winlinvip Sep 5, 2014
922bc3e
refine configure, use console for gmc/gcp/gmp/gprof
winlinvip Sep 9, 2014
79938f3
add comments for gmc.
winlinvip Sep 10, 2014
6172811
donot destroy the source and connections of gmc.
winlinvip Sep 10, 2014
9dd0939
fix the bug for gmc. 0.9.211
winlinvip Sep 10, 2014
1d454cd
add bug for http-mp4.
winlinvip Sep 16, 2014
87aac3d
refine log, add features for macro. 0.9.212
winlinvip Sep 23, 2014
83f266b
fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213.
winlinvip Sep 25, 2014
2d7f5dd
add cmakelists.txt for cmake for clion of jetbrains. 0.9.214
winlinvip Sep 26, 2014
4a323e6
add openssl for cmake.
winlinvip Sep 26, 2014
002facb
refine code, fix bug of hls, following jetbrains clion code-inspector…
winlinvip Sep 26, 2014
20ebf68
fix hls bug, refine config and log, according to clion of jetbrains. …
winlinvip Sep 26, 2014
bcd1b3d
refine code, remove unused code of dvr.
winlinvip Sep 27, 2014
624ab86
fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid.
winlinvip Sep 27, 2014
63c9ad2
fix the bug by refine code, rename the get_perfer_cid to get_prefer_c…
winlinvip Sep 27, 2014
e0b1e04
add stub code for bug #180, check complex handshake.
winlinvip Sep 27, 2014
bc6616b
refine code according to inspect of clion. 0.9.219
winlinvip Sep 28, 2014
f300214
fix #180: crash for multiple edge publishing the same stream. 0.9.220.
winlinvip Sep 30, 2014
2048fbf
refine code, add bug #160 for big chunk size.
winlinvip Sep 30, 2014
67188dc
remove the test code of main.
winlinvip Sep 30, 2014
967de9d
for bug #159: postpone the http server bug to 2.0+
winlinvip Sep 30, 2014
b830b99
fix bug #162, requires epoll. 0.9.222
winlinvip Oct 8, 2014
3f9a53d
refine cmake list, only for clion.
winlinvip Oct 8, 2014
f33f91c
update readme.
winlinvip Oct 8, 2014
13b0927
refine code for bug #151, refine the source functions, add comments.
winlinvip Oct 8, 2014
9789335
fix #151, always reap ts whatever audio or video packet. 0.9.223.
winlinvip Oct 8, 2014
2ed794a
refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224
winlinvip Oct 9, 2014
a9cceee
refine the run script for centos7
winlinvip Oct 9, 2014
bea53dc
refine the run script for centos7
winlinvip Oct 9, 2014
3fcbb60
add add hosts and wiki.
winlinvip Oct 9, 2014
5e8f8ad
add add hosts and wiki.
winlinvip Oct 9, 2014
6468b9e
refine script, to disable iptables and selinux. 0.9.225
winlinvip Oct 9, 2014
effcd89
refine script.
winlinvip Oct 9, 2014
dddec34
update to 1.0beta, 1.0.0
winlinvip Oct 9, 2014
fed8c31
update readme for 1.0beta. 1.0.0
winlinvip Oct 9, 2014
570d2a4
update readme for 1.0beta.
winlinvip Oct 9, 2014
1d939f5
update readme for 1.0beta.
winlinvip Oct 9, 2014
024611c
update package for pi, check the lsb_release.
winlinvip Oct 9, 2014
fca500f
update package for pi, check the lsb_release.
winlinvip Oct 9, 2014
2be014e
remove the dead code for bug #180
winlinvip Oct 9, 2014
e455032
update readme for 1.0beta
winlinvip Oct 9, 2014
b370b17
update readme for 1.0beta
winlinvip Oct 9, 2014
1bf6c32
I donot think QQ is neccessary.
winlinvip Oct 15, 2014
cb7f3a8
remove qq url.
winlinvip Oct 16, 2014
bd158ec
hotfix for bug #183, donot support AnnexB when decoding RTMP body for…
winlinvip Oct 19, 2014
6da2136
update readme, rename wiki/xxx to wiki/v1_xxx
winlinvip Oct 24, 2014
77d14ff
update readme, rename wiki/xxx to wiki/v1_xxx
winlinvip Oct 24, 2014
aa98ca6
fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3.
winlinvip Oct 24, 2014
d8e55d1
rename EN/CN home
winlinvip Oct 24, 2014
fe59783
add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.
winlinvip Oct 24, 2014
e3e18b9
for bug #186, read the args when discovery it. 1.0.4
winlinvip Oct 24, 2014
3c31e6d
for bug #186, read the args when discovery it. 1.0.4
winlinvip Oct 24, 2014
bbb1e0b
Initial commit
winlinvip Oct 27, 2014
c69d523
remove license
winlinvip Oct 27, 2014
2f1a792
Merge branch 'srs.1.0release' into 1.0release
winlinvip Oct 27, 2014
74f7c32
update readme, add oschina mirror.
winlinvip Oct 27, 2014
2175102
remove the sync script for mirror, which maybe updated.
winlinvip Oct 27, 2014
d004c30
Merge branch 'srs.1.0release' into 1.0release
winlinvip Oct 27, 2014
f2f259d
use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISIO…
winlinvip Nov 6, 2014
16ee1a8
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 6, 2014
eba1740
hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6.
winlinvip Nov 13, 2014
2da1ba0
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 13, 2014
8878367
update readme for wiki
winlinvip Nov 15, 2014
dc0757f
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 15, 2014
2599165
update 1.0release readme, remove the unstable features.
winlinvip Nov 16, 2014
d7265a3
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 16, 2014
7f987bb
update readme, add qq group.
winlinvip Nov 16, 2014
a7faf54
update readme, add qq group.
winlinvip Nov 16, 2014
dc1c78e
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 17, 2014
c1e9aed
all wiki translated to English. 1.0.7
winlinvip Nov 18, 2014
ad6e838
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 18, 2014
32cf44e
update PRIMARY, AUTHORS, CONTRIBUTORS rule
winlinvip Nov 25, 2014
44962c9
update PRIMARY, AUTHORS, CONTRIBUTORS rule
winlinvip Nov 25, 2014
d672fae
update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8
winlinvip Nov 25, 2014
9426b83
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 25, 2014
db7af62
update PRIMARY, AUTHORS, CONTRIBUTORS rule
winlinvip Nov 25, 2014
cd0ab5f
update PRIMARY, AUTHORS, CONTRIBUTORS rule
winlinvip Nov 25, 2014
1c90b19
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 25, 2014
d91a9df
udpate the srs_bwt.
winlinvip Nov 25, 2014
c613321
Merge branch 'srs.1.0release' into 1.0release
winlinvip Nov 25, 2014
be53b10
refine log position
winlinvip Nov 27, 2014
575e50b
hotfix to add comments on 1.0release
winlinvip Nov 27, 2014
9c033c7
hotfix 1.0, author bug, use error macro. 1.0.9
winlinvip Nov 27, 2014
127b96b
add git2unix and git commit script.
winlinvip Nov 28, 2014
0c132e9
update the log position.
winlinvip Nov 28, 2014
3d0d43c
token bug
Dec 2, 2014
ba3e7c2
Merge pull request #239 from tufang14/1.0release
winlinvip Dec 2, 2014
304208f
fix #239, traverse the token before response connect. 1.0.10.
winlinvip Dec 2, 2014
24815e4
refine code for bug #239
winlinvip Dec 2, 2014
9bda56c
update readme for bug #239
winlinvip Dec 2, 2014
8aff915
release SRS 1.0
winlinvip Dec 5, 2014
71155fc
update readme for 1.0release
winlinvip Dec 7, 2014
d4fb58b
update donation, refer to nginx http://nginx.org/en/donation.html
winlinvip Dec 19, 2014
1dfac0b
fix #264, support disconnect publish connect when hls error. 1.0.11
winlinvip Dec 20, 2014
7737042
fix #264, remove the test code. 1.0.11
winlinvip Dec 20, 2014
2e43a63
fix #264, ignore the video NALU which is actually a sequence header t…
winlinvip Dec 22, 2014
ac11e33
update readme for #264
winlinvip Dec 26, 2014
c8e4336
update master hotfix readme.
winlinvip Dec 26, 2014
5a0bfd4
test git, hotfix on release 1.0 branch.
winlinvip Dec 26, 2014
bf9c32f
Merge branch '1.0release'
winlinvip Dec 26, 2014
cefd210
test git, hotfix on 1.0 release branch.
winlinvip Dec 26, 2014
e8b3a0f
test git, hotfix on 1.0 release branch.
winlinvip Dec 26, 2014
76e8bb2
Merge branch '1.0release'
winlinvip Dec 26, 2014
49daee3
hotfix 1.0release, remove the multiple process arch, for 2.0 supports…
winlinvip Dec 26, 2014
02ec771
hotfix 1.0release, update the system requirements.
winlinvip Dec 26, 2014
9a66d22
hotfix 1.0release, 1.0.13
winlinvip Dec 26, 2014
dfd4eec
hotfix 1.0release, git checkout develop when commit
winlinvip Dec 26, 2014
dec4f6b
hotfix 1.0release, add remote gitlab
winlinvip Dec 26, 2014
e77e4cf
hotfix 1.0release, add gitlab remote mirror
winlinvip Dec 26, 2014
513c1ec
fix #268, the hls pcr is negative when startup. 1.0.14
winlinvip Dec 29, 2014
d9aca8a
hotfix #267, the forward dest ep should use server. 1.0.15
winlinvip Dec 29, 2014
bb6dfe4
fix #270, memory leak for http client post. 1.0.16
winlinvip Jan 1, 2015
ca977ef
hotfix #216, http-callback post in application/json content-type. 1.0.17
winlinvip Jan 2, 2015
629d2d8
Update srs_app_log.cpp
Jan 2, 2015
fbc35c4
Merge pull request #271 from tufang14/master
winlinvip Jan 2, 2015
e590537
fix #207, trim the last 0 of log. 1.0.18
winlinvip Jan 2, 2015
f9a33fb
fix the compile failed for utest at 32bits cpus
winlinvip Jan 3, 2015
247b772
hotfix to remove the pageUrl for http callback. 1.0.19
winlinvip Jan 3, 2015
27e0521
fix #281, fix hls bug ignore type-9 send aud. 1.0.20
winlinvip Jan 8, 2015
c80477d
update readme.
winlinvip Jan 8, 2015
b705ed0
for bug #288, refine the codec decode info frame failed. 1.0.21
winlinvip Jan 14, 2015
1316dab
update donation link to develop
winlinvip Jan 15, 2015
bb74c8d
update readme for 1.0r1
winlinvip Jan 15, 2015
9bbce05
publish 1.0r1 release(1.0.20)
winlinvip Jan 15, 2015
98fb504
update readme for 1.0r1, 1.0.21
winlinvip Jan 15, 2015
c984f43
merge from 1.0release for 1.0rc1, 1.0.21
winlinvip Jan 15, 2015
118efcb
update the file for 1.0rc1.
winlinvip Jan 15, 2015
cd0e357
Merge branch '1.0release'
winlinvip Jan 15, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,16 @@
*.lai
*.la
*.a

# by winlin
*.pyc
*.swp
/trunk/Makefile
/trunk/objs
/trunk/research/librtmp/objs
/trunk/3rdparty/ccache/ccache-3.1.9
/trunk/3rdparty/gprof/graphviz-2.36.0
/trunk/research/api-server/static-dir/crossdomain.xml
/trunk/research/api-server/static-dir/forward
/trunk/research/api-server/static-dir/live
/trunk/research/api-server/static-dir/players
24 changes: 24 additions & 0 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
There are three types of people that have contributed to the SRS project:
1. PRIMARY: Contribute important features and >10% code. Names of all PRIMARY response in NetConnection.connect and metadata.
2. AUTHORS: Contribute features and 1%~10% code. Names of all PRIMARY response in NetConnection.connect and metadata.
3. CONTRIBUTORS: Submit patches, report bugs, add translations, help answer newbie questions, and generally make SRS that much better.

PRIMARY ordered by first contribution.
* winlin<[email protected]> "Plan, arch, implement SRS1.0 and SRS2.0"

AUTHORS ordered by first contribution.
* wenjie.zhao<[email protected]> "The bandwidth test module"

CONTRIBUTORS ordered by first contribution.
* xiangcheng.liu<[email protected]> "Bug fixed"
* naijia.liu<[email protected]> "Performance benchmark"
* alcoholyi<[email protected]> "Bug fixed"
* byteman<[email protected]> "Bug fixed"
* chad.wang<[email protected]> "Bug fixed"
* suhetao<[email protected]> "Bug fixed"
* Johnny<[email protected]> "Create domain ossrs.net"
* karthikeyan<[email protected]> "Bug fixed"
* StevenLiu<[email protected]> "Build SRS on Darwin OSX"
* zhengfl<[email protected]> "Bug fixed"
* tufang14<[email protected]> "Bug fixed"

30 changes: 30 additions & 0 deletions DONATIONS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Donations ordered by first donation.

===========================================================
2014

RMB 1000+
* [2014-04-25 13:21] 刘连响
* [2014-04-25 13:31] 郭强
* [2014-07-30 11:29] 周凯
* [2014-08-15 10:55] 雷健

RMB 500-999
* [2014-07-24 08:52] 黄英才

RMB 100-499
* [2014-04-25 13:25] 张瑞圣
* [2014-05-12 10:22] 陈晨
* [2014-08-07 22:56] 陈亮
* [2014-08-19 20:00] Matthew
* [2014-09-05 16:13] 于冰
* [2014-11-19 22:38] 夏江龙

RMB 50-99
* [2014-06-17 17:57] 陈江兵
* [2014-08-04 10:47] 宋志
* [2014-08-15 13:31] ZACH

RMB 0.01-49
* [2014-08-20 20:13] 林瑞潮

3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013 winlin
Copyright (c) 2013-2014 winlin

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand All @@ -18,3 +18,4 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Loading