胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
6bfb743a 1 parent f0ae66a0

remove the unused app http file

内嵌 并排对比
正在显示 12 个修改的文件 包含 1 行增加 和 74 行删除
@@ -169,7 +169,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then @@ -169,7 +169,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
169 MODULE_DEPENDS=("CORE" "KERNEL" "RTMP") 169 MODULE_DEPENDS=("CORE" "KERNEL" "RTMP")
170 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS_DIR}) 170 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${SRS_OBJS_DIR})
171 MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source" 171 MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_st_socket" "srs_app_source"
172 - "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http" 172 + "srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder"
173 "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config" 173 "srs_app_thread" "srs_app_bandwidth" "srs_app_st" "srs_app_log" "srs_app_config"
174 "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks" 174 "srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks"
175 "srs_app_json" "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge" 175 "srs_app_json" "srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_dvr" "srs_app_edge"
@@ -93,8 +93,6 @@ file @@ -93,8 +93,6 @@ file
93 ../../src/app/srs_app_heartbeat.cpp, 93 ../../src/app/srs_app_heartbeat.cpp,
94 ../../src/app/srs_app_hls.hpp, 94 ../../src/app/srs_app_hls.hpp,
95 ../../src/app/srs_app_hls.cpp, 95 ../../src/app/srs_app_hls.cpp,
96 - ../../src/app/srs_app_http.hpp,  
97 - ../../src/app/srs_app_http.cpp,  
98 ../../src/app/srs_app_http_api.hpp, 96 ../../src/app/srs_app_http_api.hpp,
99 ../../src/app/srs_app_http_api.cpp, 97 ../../src/app/srs_app_http_api.cpp,
100 ../../src/app/srs_app_http_client.hpp, 98 ../../src/app/srs_app_http_client.hpp,
@@ -74,7 +74,6 @@ @@ -74,7 +74,6 @@
74 <ClInclude Include="..\..\src\app\srs_app_forward.hpp" /> 74 <ClInclude Include="..\..\src\app\srs_app_forward.hpp" />
75 <ClInclude Include="..\..\src\app\srs_app_heartbeat.hpp" /> 75 <ClInclude Include="..\..\src\app\srs_app_heartbeat.hpp" />
76 <ClInclude Include="..\..\src\app\srs_app_hls.hpp" /> 76 <ClInclude Include="..\..\src\app\srs_app_hls.hpp" />
77 - <ClInclude Include="..\..\src\app\srs_app_http.hpp" />  
78 <ClInclude Include="..\..\src\app\srs_app_http_api.hpp" /> 77 <ClInclude Include="..\..\src\app\srs_app_http_api.hpp" />
79 <ClInclude Include="..\..\src\app\srs_app_http_client.hpp" /> 78 <ClInclude Include="..\..\src\app\srs_app_http_client.hpp" />
80 <ClInclude Include="..\..\src\app\srs_app_http_conn.hpp" /> 79 <ClInclude Include="..\..\src\app\srs_app_http_conn.hpp" />
@@ -156,7 +155,6 @@ @@ -156,7 +155,6 @@
156 <ClCompile Include="..\..\src\app\srs_app_forward.cpp" /> 155 <ClCompile Include="..\..\src\app\srs_app_forward.cpp" />
157 <ClCompile Include="..\..\src\app\srs_app_heartbeat.cpp" /> 156 <ClCompile Include="..\..\src\app\srs_app_heartbeat.cpp" />
158 <ClCompile Include="..\..\src\app\srs_app_hls.cpp" /> 157 <ClCompile Include="..\..\src\app\srs_app_hls.cpp" />
159 - <ClCompile Include="..\..\src\app\srs_app_http.cpp" />  
160 <ClCompile Include="..\..\src\app\srs_app_http_api.cpp" /> 158 <ClCompile Include="..\..\src\app\srs_app_http_api.cpp" />
161 <ClCompile Include="..\..\src\app\srs_app_http_client.cpp" /> 159 <ClCompile Include="..\..\src\app\srs_app_http_client.cpp" />
162 <ClCompile Include="..\..\src\app\srs_app_http_conn.cpp" /> 160 <ClCompile Include="..\..\src\app\srs_app_http_conn.cpp" />
@@ -49,7 +49,6 @@ @@ -49,7 +49,6 @@
49 3C1232A01AAE81D900CE8F6C /* srs_app_http_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232641AAE81D900CE8F6C /* srs_app_http_client.cpp */; }; 49 3C1232A01AAE81D900CE8F6C /* srs_app_http_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232641AAE81D900CE8F6C /* srs_app_http_client.cpp */; };
50 3C1232A11AAE81D900CE8F6C /* srs_app_http_conn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232661AAE81D900CE8F6C /* srs_app_http_conn.cpp */; }; 50 3C1232A11AAE81D900CE8F6C /* srs_app_http_conn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232661AAE81D900CE8F6C /* srs_app_http_conn.cpp */; };
51 3C1232A21AAE81D900CE8F6C /* srs_app_http_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232681AAE81D900CE8F6C /* srs_app_http_hooks.cpp */; }; 51 3C1232A21AAE81D900CE8F6C /* srs_app_http_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232681AAE81D900CE8F6C /* srs_app_http_hooks.cpp */; };
52 - 3C1232A31AAE81D900CE8F6C /* srs_app_http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12326A1AAE81D900CE8F6C /* srs_app_http.cpp */; };  
53 3C1232A41AAE81D900CE8F6C /* srs_app_ingest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */; }; 52 3C1232A41AAE81D900CE8F6C /* srs_app_ingest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */; };
54 3C1232A51AAE81D900CE8F6C /* srs_app_json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */; }; 53 3C1232A51AAE81D900CE8F6C /* srs_app_json.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */; };
55 3C1232A61AAE81D900CE8F6C /* srs_app_kbps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232701AAE81D900CE8F6C /* srs_app_kbps.cpp */; }; 54 3C1232A61AAE81D900CE8F6C /* srs_app_kbps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3C1232701AAE81D900CE8F6C /* srs_app_kbps.cpp */; };
@@ -208,8 +207,6 @@ @@ -208,8 +207,6 @@
208 3C1232671AAE81D900CE8F6C /* srs_app_http_conn.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_http_conn.hpp; path = ../../../src/app/srs_app_http_conn.hpp; sourceTree = "<group>"; }; 207 3C1232671AAE81D900CE8F6C /* srs_app_http_conn.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_http_conn.hpp; path = ../../../src/app/srs_app_http_conn.hpp; sourceTree = "<group>"; };
209 3C1232681AAE81D900CE8F6C /* srs_app_http_hooks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_http_hooks.cpp; path = ../../../src/app/srs_app_http_hooks.cpp; sourceTree = "<group>"; }; 208 3C1232681AAE81D900CE8F6C /* srs_app_http_hooks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_http_hooks.cpp; path = ../../../src/app/srs_app_http_hooks.cpp; sourceTree = "<group>"; };
210 3C1232691AAE81D900CE8F6C /* srs_app_http_hooks.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_http_hooks.hpp; path = ../../../src/app/srs_app_http_hooks.hpp; sourceTree = "<group>"; }; 209 3C1232691AAE81D900CE8F6C /* srs_app_http_hooks.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_http_hooks.hpp; path = ../../../src/app/srs_app_http_hooks.hpp; sourceTree = "<group>"; };
211 - 3C12326A1AAE81D900CE8F6C /* srs_app_http.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_http.cpp; path = ../../../src/app/srs_app_http.cpp; sourceTree = "<group>"; };  
212 - 3C12326B1AAE81D900CE8F6C /* srs_app_http.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_http.hpp; path = ../../../src/app/srs_app_http.hpp; sourceTree = "<group>"; };  
213 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_ingest.cpp; path = ../../../src/app/srs_app_ingest.cpp; sourceTree = "<group>"; }; 210 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_ingest.cpp; path = ../../../src/app/srs_app_ingest.cpp; sourceTree = "<group>"; };
214 3C12326D1AAE81D900CE8F6C /* srs_app_ingest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_ingest.hpp; path = ../../../src/app/srs_app_ingest.hpp; sourceTree = "<group>"; }; 211 3C12326D1AAE81D900CE8F6C /* srs_app_ingest.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = srs_app_ingest.hpp; path = ../../../src/app/srs_app_ingest.hpp; sourceTree = "<group>"; };
215 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_json.cpp; path = ../../../src/app/srs_app_json.cpp; sourceTree = "<group>"; }; 212 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = srs_app_json.cpp; path = ../../../src/app/srs_app_json.cpp; sourceTree = "<group>"; };
@@ -555,8 +552,6 @@ @@ -555,8 +552,6 @@
555 3C1232671AAE81D900CE8F6C /* srs_app_http_conn.hpp */, 552 3C1232671AAE81D900CE8F6C /* srs_app_http_conn.hpp */,
556 3C1232681AAE81D900CE8F6C /* srs_app_http_hooks.cpp */, 553 3C1232681AAE81D900CE8F6C /* srs_app_http_hooks.cpp */,
557 3C1232691AAE81D900CE8F6C /* srs_app_http_hooks.hpp */, 554 3C1232691AAE81D900CE8F6C /* srs_app_http_hooks.hpp */,
558 - 3C12326A1AAE81D900CE8F6C /* srs_app_http.cpp */,  
559 - 3C12326B1AAE81D900CE8F6C /* srs_app_http.hpp */,  
560 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */, 555 3C12326C1AAE81D900CE8F6C /* srs_app_ingest.cpp */,
561 3C12326D1AAE81D900CE8F6C /* srs_app_ingest.hpp */, 556 3C12326D1AAE81D900CE8F6C /* srs_app_ingest.hpp */,
562 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */, 557 3C12326E1AAE81D900CE8F6C /* srs_app_json.cpp */,
@@ -942,7 +937,6 @@ @@ -942,7 +937,6 @@
942 3C1232AF1AAE81D900CE8F6C /* srs_app_rtsp.cpp in Sources */, 937 3C1232AF1AAE81D900CE8F6C /* srs_app_rtsp.cpp in Sources */,
943 3CC52DDD1ACE4023006FEB01 /* srs_utest_reload.cpp in Sources */, 938 3CC52DDD1ACE4023006FEB01 /* srs_utest_reload.cpp in Sources */,
944 3C689FA11AB6AAC800C9CEEE /* sync.c in Sources */, 939 3C689FA11AB6AAC800C9CEEE /* sync.c in Sources */,
945 - 3C1232A31AAE81D900CE8F6C /* srs_app_http.cpp in Sources */,  
946 3C12329A1AAE81D900CE8F6C /* srs_app_encoder.cpp in Sources */, 940 3C12329A1AAE81D900CE8F6C /* srs_app_encoder.cpp in Sources */,
947 ); 941 );
948 runOnlyForDeploymentPostprocessing = 0; 942 runOnlyForDeploymentPostprocessing = 0;
@@ -33,7 +33,6 @@ using namespace std; @@ -33,7 +33,6 @@ using namespace std;
33 #include <srs_app_config.hpp> 33 #include <srs_app_config.hpp>
34 #include <srs_app_http_client.hpp> 34 #include <srs_app_http_client.hpp>
35 #include <srs_app_json.hpp> 35 #include <srs_app_json.hpp>
36 -#include <srs_app_http.hpp>  
37 #include <srs_app_utility.hpp> 36 #include <srs_app_utility.hpp>
38 #include <srs_core_autofree.hpp> 37 #include <srs_core_autofree.hpp>
39 #include <srs_app_http_conn.hpp> 38 #include <srs_app_http_conn.hpp>
1 -/*  
2 -The MIT License (MIT)  
3 -  
4 -Copyright (c) 2013-2015 SRS(simple-rtmp-server)  
5 -  
6 -Permission is hereby granted, free of charge, to any person obtaining a copy of  
7 -this software and associated documentation files (the "Software"), to deal in  
8 -the Software without restriction, including without limitation the rights to  
9 -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of  
10 -the Software, and to permit persons to whom the Software is furnished to do so,  
11 -subject to the following conditions:  
12 -  
13 -The above copyright notice and this permission notice shall be included in all  
14 -copies or substantial portions of the Software.  
15 -  
16 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  
17 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS  
18 -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR  
19 -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER  
20 -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN  
21 -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
22 -*/  
23 -  
24 -#include <srs_app_http.hpp>  
25 -  
1 -/*  
2 -The MIT License (MIT)  
3 -  
4 -Copyright (c) 2013-2015 SRS(simple-rtmp-server)  
5 -  
6 -Permission is hereby granted, free of charge, to any person obtaining a copy of  
7 -this software and associated documentation files (the "Software"), to deal in  
8 -the Software without restriction, including without limitation the rights to  
9 -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of  
10 -the Software, and to permit persons to whom the Software is furnished to do so,  
11 -subject to the following conditions:  
12 -  
13 -The above copyright notice and this permission notice shall be included in all  
14 -copies or substantial portions of the Software.  
15 -  
16 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR  
17 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS  
18 -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR  
19 -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER  
20 -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN  
21 -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
22 -*/  
23 -  
24 -#ifndef SRS_APP_HTTP_HPP  
25 -#define SRS_APP_HTTP_HPP  
26 -  
27 -/*  
28 -#include <srs_app_http.hpp>  
29 -*/  
30 -#include <srs_core.hpp>  
31 -  
32 -#endif  
@@ -29,7 +29,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -29,7 +29,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29 29
30 using namespace std; 30 using namespace std;
31 31
32 -#include <srs_app_http.hpp>  
33 #include <srs_kernel_error.hpp> 32 #include <srs_kernel_error.hpp>
34 #include <srs_kernel_log.hpp> 33 #include <srs_kernel_log.hpp>
35 #include <srs_app_st_socket.hpp> 34 #include <srs_app_st_socket.hpp>
@@ -42,7 +42,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -42,7 +42,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
42 42
43 #include <srs_app_st.hpp> 43 #include <srs_app_st.hpp>
44 #include <srs_http_stack.hpp> 44 #include <srs_http_stack.hpp>
45 -#include <srs_app_http.hpp>  
46 #include <srs_app_reload.hpp> 45 #include <srs_app_reload.hpp>
47 #include <srs_kernel_file.hpp> 46 #include <srs_kernel_file.hpp>
48 #include <srs_app_thread.hpp> 47 #include <srs_app_thread.hpp>
@@ -31,7 +31,6 @@ using namespace std; @@ -31,7 +31,6 @@ using namespace std;
31 #include <srs_kernel_error.hpp> 31 #include <srs_kernel_error.hpp>
32 #include <srs_rtmp_sdk.hpp> 32 #include <srs_rtmp_sdk.hpp>
33 #include <srs_app_st_socket.hpp> 33 #include <srs_app_st_socket.hpp>
34 -#include <srs_app_http.hpp>  
35 #include <srs_app_json.hpp> 34 #include <srs_app_json.hpp>
36 #include <srs_app_dvr.hpp> 35 #include <srs_app_dvr.hpp>
37 #include <srs_app_http_client.hpp> 36 #include <srs_app_http_client.hpp>
@@ -41,7 +41,6 @@ using namespace std; @@ -41,7 +41,6 @@ using namespace std;
41 #include <srs_app_config.hpp> 41 #include <srs_app_config.hpp>
42 #include <srs_app_refer.hpp> 42 #include <srs_app_refer.hpp>
43 #include <srs_app_hls.hpp> 43 #include <srs_app_hls.hpp>
44 -#include <srs_app_http.hpp>  
45 #include <srs_app_bandwidth.hpp> 44 #include <srs_app_bandwidth.hpp>
46 #include <srs_app_st_socket.hpp> 45 #include <srs_app_st_socket.hpp>
47 #include <srs_app_http_hooks.hpp> 46 #include <srs_app_http_hooks.hpp>
@@ -39,7 +39,6 @@ using namespace std; @@ -39,7 +39,6 @@ using namespace std;
39 #include <srs_kernel_stream.hpp> 39 #include <srs_kernel_stream.hpp>
40 #include <srs_kernel_ts.hpp> 40 #include <srs_kernel_ts.hpp>
41 #include <srs_app_http_client.hpp> 41 #include <srs_app_http_client.hpp>
42 -#include <srs_app_http.hpp>  
43 #include <srs_core_autofree.hpp> 42 #include <srs_core_autofree.hpp>
44 #include <srs_app_st.hpp> 43 #include <srs_app_st.hpp>
45 #include <srs_rtmp_utility.hpp> 44 #include <srs_rtmp_utility.hpp>