胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
26678151 1 parent c46b3bd1

refine consts, move http consts to kernel consts

内嵌 并排对比
正在显示 2 个修改的文件 包含 93 行增加 和 83 行删除
@@ -62,89 +62,6 @@ class SrsHttpHandler; @@ -62,89 +62,6 @@ class SrsHttpHandler;
62 #define __SRS_CRLF "\r\n" // 0x0D0A 62 #define __SRS_CRLF "\r\n" // 0x0D0A
63 #define __SRS_CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A 63 #define __SRS_CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A
64 64
65 -// 6.1.1 Status Code and Reason Phrase  
66 -#define SRS_CONSTS_HTTP_Continue 100  
67 -#define SRS_CONSTS_HTTP_SwitchingProtocols 101  
68 -#define SRS_CONSTS_HTTP_OK 200  
69 -#define SRS_CONSTS_HTTP_Created 201  
70 -#define SRS_CONSTS_HTTP_Accepted 202  
71 -#define SRS_CONSTS_HTTP_NonAuthoritativeInformation 203  
72 -#define SRS_CONSTS_HTTP_NoContent 204  
73 -#define SRS_CONSTS_HTTP_ResetContent 205  
74 -#define SRS_CONSTS_HTTP_PartialContent 206  
75 -#define SRS_CONSTS_HTTP_MultipleChoices 300  
76 -#define SRS_CONSTS_HTTP_MovedPermanently 301  
77 -#define SRS_CONSTS_HTTP_Found 302  
78 -#define SRS_CONSTS_HTTP_SeeOther 303  
79 -#define SRS_CONSTS_HTTP_NotModified 304  
80 -#define SRS_CONSTS_HTTP_UseProxy 305  
81 -#define SRS_CONSTS_HTTP_TemporaryRedirect 307  
82 -#define SRS_CONSTS_HTTP_BadRequest 400  
83 -#define SRS_CONSTS_HTTP_Unauthorized 401  
84 -#define SRS_CONSTS_HTTP_PaymentRequired 402  
85 -#define SRS_CONSTS_HTTP_Forbidden 403  
86 -#define SRS_CONSTS_HTTP_NotFound 404  
87 -#define SRS_CONSTS_HTTP_MethodNotAllowed 405  
88 -#define SRS_CONSTS_HTTP_NotAcceptable 406  
89 -#define SRS_CONSTS_HTTP_ProxyAuthenticationRequired 407  
90 -#define SRS_CONSTS_HTTP_RequestTimeout 408  
91 -#define SRS_CONSTS_HTTP_Conflict 409  
92 -#define SRS_CONSTS_HTTP_Gone 410  
93 -#define SRS_CONSTS_HTTP_LengthRequired 411  
94 -#define SRS_CONSTS_HTTP_PreconditionFailed 412  
95 -#define SRS_CONSTS_HTTP_RequestEntityTooLarge 413  
96 -#define SRS_CONSTS_HTTP_RequestURITooLarge 414  
97 -#define SRS_CONSTS_HTTP_UnsupportedMediaType 415  
98 -#define SRS_CONSTS_HTTP_RequestedRangeNotSatisfiable 416  
99 -#define SRS_CONSTS_HTTP_ExpectationFailed 417  
100 -#define SRS_CONSTS_HTTP_InternalServerError 500  
101 -#define SRS_CONSTS_HTTP_NotImplemented 501  
102 -#define SRS_CONSTS_HTTP_BadGateway 502  
103 -#define SRS_CONSTS_HTTP_ServiceUnavailable 503  
104 -#define SRS_CONSTS_HTTP_GatewayTimeout 504  
105 -#define SRS_CONSTS_HTTP_HTTPVersionNotSupported 505  
106 -  
107 -#define SRS_CONSTS_HTTP_Continue_str "Continue"  
108 -#define SRS_CONSTS_HTTP_SwitchingProtocols_str "Switching Protocols"  
109 -#define SRS_CONSTS_HTTP_OK_str "OK"  
110 -#define SRS_CONSTS_HTTP_Created_str "Created "  
111 -#define SRS_CONSTS_HTTP_Accepted_str "Accepted"  
112 -#define SRS_CONSTS_HTTP_NonAuthoritativeInformation_str "Non Authoritative Information "  
113 -#define SRS_CONSTS_HTTP_NoContent_str "No Content "  
114 -#define SRS_CONSTS_HTTP_ResetContent_str "Reset Content"  
115 -#define SRS_CONSTS_HTTP_PartialContent_str "Partial Content"  
116 -#define SRS_CONSTS_HTTP_MultipleChoices_str "Multiple Choices "  
117 -#define SRS_CONSTS_HTTP_MovedPermanently_str "Moved Permanently"  
118 -#define SRS_CONSTS_HTTP_Found_str "Found"  
119 -#define SRS_CONSTS_HTTP_SeeOther_str "See Other"  
120 -#define SRS_CONSTS_HTTP_NotModified_str "Not Modified "  
121 -#define SRS_CONSTS_HTTP_UseProxy_str "Use Proxy"  
122 -#define SRS_CONSTS_HTTP_TemporaryRedirect_str "Temporary Redirect "  
123 -#define SRS_CONSTS_HTTP_BadRequest_str "Bad Request"  
124 -#define SRS_CONSTS_HTTP_Unauthorized_str "Unauthorized"  
125 -#define SRS_CONSTS_HTTP_PaymentRequired_str "Payment Required "  
126 -#define SRS_CONSTS_HTTP_Forbidden_str "Forbidden "  
127 -#define SRS_CONSTS_HTTP_NotFound_str "Not Found"  
128 -#define SRS_CONSTS_HTTP_MethodNotAllowed_str "Method Not Allowed"  
129 -#define SRS_CONSTS_HTTP_NotAcceptable_str "Not Acceptable "  
130 -#define SRS_CONSTS_HTTP_ProxyAuthenticationRequired_str "Proxy Authentication Required "  
131 -#define SRS_CONSTS_HTTP_RequestTimeout_str "Request Timeout"  
132 -#define SRS_CONSTS_HTTP_Conflict_str "Conflict"  
133 -#define SRS_CONSTS_HTTP_Gone_str "Gone"  
134 -#define SRS_CONSTS_HTTP_LengthRequired_str "Length Required"  
135 -#define SRS_CONSTS_HTTP_PreconditionFailed_str "Precondition Failed"  
136 -#define SRS_CONSTS_HTTP_RequestEntityTooLarge_str "Request Entity Too Large "  
137 -#define SRS_CONSTS_HTTP_RequestURITooLarge_str "Request URI Too Large"  
138 -#define SRS_CONSTS_HTTP_UnsupportedMediaType_str "Unsupported Media Type"  
139 -#define SRS_CONSTS_HTTP_RequestedRangeNotSatisfiable_str "Requested Range Not Satisfiable"  
140 -#define SRS_CONSTS_HTTP_ExpectationFailed_str "Expectation Failed "  
141 -#define SRS_CONSTS_HTTP_InternalServerError_str "Internal Server Error "  
142 -#define SRS_CONSTS_HTTP_NotImplemented_str "Not Implemented"  
143 -#define SRS_CONSTS_HTTP_BadGateway_str "Bad Gateway"  
144 -#define SRS_CONSTS_HTTP_ServiceUnavailable_str "Service Unavailable"  
145 -#define SRS_CONSTS_HTTP_GatewayTimeout_str "Gateway Timeout"  
146 -#define SRS_CONSTS_HTTP_HTTPVersionNotSupported_str "HTTP Version Not Supported"  
147 -  
148 // @see SrsHttpMessage._http_ts_send_buffer 65 // @see SrsHttpMessage._http_ts_send_buffer
149 #define SRS_CONSTS_HTTP_TS_SEND_BUFFER_SIZE 4096 66 #define SRS_CONSTS_HTTP_TS_SEND_BUFFER_SIZE 4096
150 67
@@ -150,4 +150,97 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -150,4 +150,97 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
150 // the pithy stage for all edge. 150 // the pithy stage for all edge.
151 #define SRS_CONSTS_STAGE_EDGE 7 151 #define SRS_CONSTS_STAGE_EDGE 7
152 152
  153 +///////////////////////////////////////////////////////////
  154 +///////////////////////////////////////////////////////////
  155 +///////////////////////////////////////////////////////////
  156 +///////////////////////////////////////////////////////////
  157 +///////////////////////////////////////////////////////////
  158 +///////////////////////////////////////////////////////////
  159 +
  160 +///////////////////////////////////////////////////////////
  161 +// HTTP consts values
  162 +///////////////////////////////////////////////////////////
  163 +// 6.1.1 Status Code and Reason Phrase
  164 +#define SRS_CONSTS_HTTP_Continue 100
  165 +#define SRS_CONSTS_HTTP_SwitchingProtocols 101
  166 +#define SRS_CONSTS_HTTP_OK 200
  167 +#define SRS_CONSTS_HTTP_Created 201
  168 +#define SRS_CONSTS_HTTP_Accepted 202
  169 +#define SRS_CONSTS_HTTP_NonAuthoritativeInformation 203
  170 +#define SRS_CONSTS_HTTP_NoContent 204
  171 +#define SRS_CONSTS_HTTP_ResetContent 205
  172 +#define SRS_CONSTS_HTTP_PartialContent 206
  173 +#define SRS_CONSTS_HTTP_MultipleChoices 300
  174 +#define SRS_CONSTS_HTTP_MovedPermanently 301
  175 +#define SRS_CONSTS_HTTP_Found 302
  176 +#define SRS_CONSTS_HTTP_SeeOther 303
  177 +#define SRS_CONSTS_HTTP_NotModified 304
  178 +#define SRS_CONSTS_HTTP_UseProxy 305
  179 +#define SRS_CONSTS_HTTP_TemporaryRedirect 307
  180 +#define SRS_CONSTS_HTTP_BadRequest 400
  181 +#define SRS_CONSTS_HTTP_Unauthorized 401
  182 +#define SRS_CONSTS_HTTP_PaymentRequired 402
  183 +#define SRS_CONSTS_HTTP_Forbidden 403
  184 +#define SRS_CONSTS_HTTP_NotFound 404
  185 +#define SRS_CONSTS_HTTP_MethodNotAllowed 405
  186 +#define SRS_CONSTS_HTTP_NotAcceptable 406
  187 +#define SRS_CONSTS_HTTP_ProxyAuthenticationRequired 407
  188 +#define SRS_CONSTS_HTTP_RequestTimeout 408
  189 +#define SRS_CONSTS_HTTP_Conflict 409
  190 +#define SRS_CONSTS_HTTP_Gone 410
  191 +#define SRS_CONSTS_HTTP_LengthRequired 411
  192 +#define SRS_CONSTS_HTTP_PreconditionFailed 412
  193 +#define SRS_CONSTS_HTTP_RequestEntityTooLarge 413
  194 +#define SRS_CONSTS_HTTP_RequestURITooLarge 414
  195 +#define SRS_CONSTS_HTTP_UnsupportedMediaType 415
  196 +#define SRS_CONSTS_HTTP_RequestedRangeNotSatisfiable 416
  197 +#define SRS_CONSTS_HTTP_ExpectationFailed 417
  198 +#define SRS_CONSTS_HTTP_InternalServerError 500
  199 +#define SRS_CONSTS_HTTP_NotImplemented 501
  200 +#define SRS_CONSTS_HTTP_BadGateway 502
  201 +#define SRS_CONSTS_HTTP_ServiceUnavailable 503
  202 +#define SRS_CONSTS_HTTP_GatewayTimeout 504
  203 +#define SRS_CONSTS_HTTP_HTTPVersionNotSupported 505
  204 +
  205 +#define SRS_CONSTS_HTTP_Continue_str "Continue"
  206 +#define SRS_CONSTS_HTTP_SwitchingProtocols_str "Switching Protocols"
  207 +#define SRS_CONSTS_HTTP_OK_str "OK"
  208 +#define SRS_CONSTS_HTTP_Created_str "Created "
  209 +#define SRS_CONSTS_HTTP_Accepted_str "Accepted"
  210 +#define SRS_CONSTS_HTTP_NonAuthoritativeInformation_str "Non Authoritative Information "
  211 +#define SRS_CONSTS_HTTP_NoContent_str "No Content "
  212 +#define SRS_CONSTS_HTTP_ResetContent_str "Reset Content"
  213 +#define SRS_CONSTS_HTTP_PartialContent_str "Partial Content"
  214 +#define SRS_CONSTS_HTTP_MultipleChoices_str "Multiple Choices "
  215 +#define SRS_CONSTS_HTTP_MovedPermanently_str "Moved Permanently"
  216 +#define SRS_CONSTS_HTTP_Found_str "Found"
  217 +#define SRS_CONSTS_HTTP_SeeOther_str "See Other"
  218 +#define SRS_CONSTS_HTTP_NotModified_str "Not Modified "
  219 +#define SRS_CONSTS_HTTP_UseProxy_str "Use Proxy"
  220 +#define SRS_CONSTS_HTTP_TemporaryRedirect_str "Temporary Redirect "
  221 +#define SRS_CONSTS_HTTP_BadRequest_str "Bad Request"
  222 +#define SRS_CONSTS_HTTP_Unauthorized_str "Unauthorized"
  223 +#define SRS_CONSTS_HTTP_PaymentRequired_str "Payment Required "
  224 +#define SRS_CONSTS_HTTP_Forbidden_str "Forbidden "
  225 +#define SRS_CONSTS_HTTP_NotFound_str "Not Found"
  226 +#define SRS_CONSTS_HTTP_MethodNotAllowed_str "Method Not Allowed"
  227 +#define SRS_CONSTS_HTTP_NotAcceptable_str "Not Acceptable "
  228 +#define SRS_CONSTS_HTTP_ProxyAuthenticationRequired_str "Proxy Authentication Required "
  229 +#define SRS_CONSTS_HTTP_RequestTimeout_str "Request Timeout"
  230 +#define SRS_CONSTS_HTTP_Conflict_str "Conflict"
  231 +#define SRS_CONSTS_HTTP_Gone_str "Gone"
  232 +#define SRS_CONSTS_HTTP_LengthRequired_str "Length Required"
  233 +#define SRS_CONSTS_HTTP_PreconditionFailed_str "Precondition Failed"
  234 +#define SRS_CONSTS_HTTP_RequestEntityTooLarge_str "Request Entity Too Large "
  235 +#define SRS_CONSTS_HTTP_RequestURITooLarge_str "Request URI Too Large"
  236 +#define SRS_CONSTS_HTTP_UnsupportedMediaType_str "Unsupported Media Type"
  237 +#define SRS_CONSTS_HTTP_RequestedRangeNotSatisfiable_str "Requested Range Not Satisfiable"
  238 +#define SRS_CONSTS_HTTP_ExpectationFailed_str "Expectation Failed "
  239 +#define SRS_CONSTS_HTTP_InternalServerError_str "Internal Server Error "
  240 +#define SRS_CONSTS_HTTP_NotImplemented_str "Not Implemented"
  241 +#define SRS_CONSTS_HTTP_BadGateway_str "Bad Gateway"
  242 +#define SRS_CONSTS_HTTP_ServiceUnavailable_str "Service Unavailable"
  243 +#define SRS_CONSTS_HTTP_GatewayTimeout_str "Gateway Timeout"
  244 +#define SRS_CONSTS_HTTP_HTTPVersionNotSupported_str "HTTP Version Not Supported"
  245 +
153 #endif 246 #endif