projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- wrap request exceptions into one request pool exception
[m6w6/ext-http]
/
http_message_api.c
diff --git
a/http_message_api.c
b/http_message_api.c
index 77f18e017c25aea336472b50aa50217fd7e10fde..b59dace58b583f3583cd712bcac5a377fdf54c91 100644
(file)
--- a/
http_message_api.c
+++ b/
http_message_api.c
@@
-15,19
+15,19
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+#define HTTP_WANT_CURL
#include "php_http.h"
#include "php_http.h"
-#include "php_http_std_defs.h"
+
+#include "SAPI.h"
+
#include "php_http_api.h"
#include "php_http_api.h"
-#include "php_http_
message
_api.h"
+#include "php_http_
encoding
_api.h"
#include "php_http_headers_api.h"
#include "php_http_headers_api.h"
-#include "php_http_
send
_api.h"
+#include "php_http_
message
_api.h"
#include "php_http_request_api.h"
#include "php_http_request_api.h"
+#include "php_http_send_api.h"
#include "php_http_url_api.h"
#include "php_http_url_api.h"
-#include "php_http_encoding_api.h"
-
-#include "phpstr/phpstr.h"
ZEND_EXTERN_MODULE_GLOBALS(http);
ZEND_EXTERN_MODULE_GLOBALS(http);
@@
-189,9
+189,9
@@
PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
ulong total = 0, start = 0, end = 0, len = 0;
if (!strncasecmp(Z_STRVAL_P(c), "bytes", lenof("bytes")) &&
ulong total = 0, start = 0, end = 0, len = 0;
if (!strncasecmp(Z_STRVAL_P(c), "bytes", lenof("bytes")) &&
- (Z_STRVAL_P(c)[lenof("bytes")] == '
=
' || Z_STRVAL_P(c)[lenof("bytes")] == ' ')) {
+ (Z_STRVAL_P(c)[lenof("bytes")] == '
:
' || Z_STRVAL_P(c)[lenof("bytes")] == ' ')) {
char *total_at = NULL, *end_at = NULL;
char *total_at = NULL, *end_at = NULL;
- char *start_at = Z_STRVAL_P(c) +
lenof("bytes=
");
+ char *start_at = Z_STRVAL_P(c) +
sizeof("bytes
");
start = strtoul(start_at, &end_at, 10);
if (end_at) {
start = strtoul(start_at, &end_at, 10);
if (end_at) {