正在显示
2 个修改的文件
包含
14 行增加
和
19 行删除
| @@ -38,8 +38,6 @@ using namespace std; | @@ -38,8 +38,6 @@ using namespace std; | ||
| 38 | #include <srs_kernel_log.hpp> | 38 | #include <srs_kernel_log.hpp> |
| 39 | #include <srs_app_socket.hpp> | 39 | #include <srs_app_socket.hpp> |
| 40 | 40 | ||
| 41 | -using namespace srs; | ||
| 42 | - | ||
| 43 | #define SRS_DEFAULT_HTTP_PORT 80 | 41 | #define SRS_DEFAULT_HTTP_PORT 80 |
| 44 | #define SRS_HTTP_RESPONSE_OK "0" | 42 | #define SRS_HTTP_RESPONSE_OK "0" |
| 45 | 43 |
| @@ -34,23 +34,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -34,23 +34,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| 34 | #ifdef SRS_HTTP_PARSER | 34 | #ifdef SRS_HTTP_PARSER |
| 35 | 35 | ||
| 36 | // http specification | 36 | // http specification |
| 37 | -namespace srs | ||
| 38 | -{ | ||
| 39 | - // CR = <US-ASCII CR, carriage return (13)> | ||
| 40 | - #define __CR "\r" // 0x0D | ||
| 41 | - // LF = <US-ASCII LF, linefeed (10)> | ||
| 42 | - #define __LF "\n" // 0x0A | ||
| 43 | - // SP = <US-ASCII SP, space (32)> | ||
| 44 | - #define __SP " " // 0x20 | ||
| 45 | - // HT = <US-ASCII HT, horizontal-tab (9)> | ||
| 46 | - #define __HT "\x09" // 0x09 | ||
| 47 | - | ||
| 48 | - // HTTP/1.1 defines the sequence CR LF as the end-of-line marker for all | ||
| 49 | - // protocol elements except the entity-body (see appendix 19.3 for | ||
| 50 | - // tolerant applications). | ||
| 51 | - #define __CRLF "\r\n" // 0x0D0A | ||
| 52 | - #define __CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A | ||
| 53 | -}; | 37 | +// CR = <US-ASCII CR, carriage return (13)> |
| 38 | +#define __CR "\r" // 0x0D | ||
| 39 | +// LF = <US-ASCII LF, linefeed (10)> | ||
| 40 | +#define __LF "\n" // 0x0A | ||
| 41 | +// SP = <US-ASCII SP, space (32)> | ||
| 42 | +#define __SP " " // 0x20 | ||
| 43 | +// HT = <US-ASCII HT, horizontal-tab (9)> | ||
| 44 | +#define __HT "\x09" // 0x09 | ||
| 45 | + | ||
| 46 | +// HTTP/1.1 defines the sequence CR LF as the end-of-line marker for all | ||
| 47 | +// protocol elements except the entity-body (see appendix 19.3 for | ||
| 48 | +// tolerant applications). | ||
| 49 | +#define __CRLF "\r\n" // 0x0D0A | ||
| 50 | +#define __CRLFCRLF "\r\n\r\n" // 0x0D0A0D0A | ||
| 54 | 51 | ||
| 55 | #endif | 52 | #endif |
| 56 | 53 |
-
请 注册 或 登录 后发表评论