projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
thread safety
[m6w6/ext-http]
/
php_http_misc.c
diff --git
a/php_http_misc.c
b/php_http_misc.c
index 8d52382f6105a444888c76d4baf93fa1472fe0da..377aa9af4a925790770924ea9749607ca3732f14 100644
(file)
--- a/
php_http_misc.c
+++ b/
php_http_misc.c
@@
-14,6
+14,10
@@
#include "php_http.h"
#include "php_http.h"
+#include <ext/standard/php_lcg.h>
+#include <ext/standard/php_string.h>
+#include <Zend/zend_exceptions.h>
+
/* SLEEP */
PHP_HTTP_API void php_http_sleep(double s)
/* SLEEP */
PHP_HTTP_API void php_http_sleep(double s)
@@
-47,7
+51,7
@@
PHP_HTTP_API void php_http_sleep(double s)
int php_http_match(const char *haystack_str, const char *needle_str, int flags)
{
int php_http_match(const char *haystack_str, const char *needle_str, int flags)
{
- int result;
+ int result
= 0
;
if (flags & PHP_HTTP_MATCH_FULL) {
if (flags & PHP_HTTP_MATCH_CASE) {
if (flags & PHP_HTTP_MATCH_FULL) {
if (flags & PHP_HTTP_MATCH_CASE) {
@@
-108,7
+112,7
@@
char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_boo
size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC)
{
size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC)
{
- return snprintf(buf, buf_len, "%
lu%0.9f", (ulong) PHP_HTTP_G->env.request.time, (float)
php_combined_lcg(TSRMLS_C));
+ return snprintf(buf, buf_len, "%
15.15F", PHP_HTTP_G->env.request.time *
php_combined_lcg(TSRMLS_C));
}
/* ARRAYS */
}
/* ARRAYS */
@@
-191,7
+195,7
@@
static inline int scope_error_handling(long type TSRMLS_DC)
return EH_THROW;
}
return EH_THROW;
}
- if (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), php_http_object_class_entry)) {
+ if (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), php_http_object_class_entry
TSRMLS_CC
)) {
return php_http_object_get_error_handling(EG(This) TSRMLS_CC);
}
return php_http_object_get_error_handling(EG(This) TSRMLS_CC);
}
@@
-206,12
+210,10
@@
void php_http_error(long type TSRMLS_DC, long code, const char *format, ...)
switch (scope_error_handling(type TSRMLS_CC)) {
case EH_THROW: {
char *message;
switch (scope_error_handling(type TSRMLS_CC)) {
case EH_THROW: {
char *message;
- zend_class_entry *ce;
+ zend_class_entry *ce
= php_http_exception_class_entry
;
- if (
EG(exception_class) && instanceof_function(EG(exception_class), php_http_exception_class_entry
)) {
+ if (
0&& EG(exception_class) && instanceof_function(EG(exception_class), php_http_exception_class_entry TSRMLS_CC
)) {
ce = EG(exception_class);
ce = EG(exception_class);
- } else {
- ce = php_http_exception_get_for_code(code);
}
vspprintf(&message, 0, format, args);
}
vspprintf(&message, 0, format, args);