projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- module/includes cleanup
[m6w6/ext-http]
/
http_message_object.c
diff --git
a/http_message_object.c
b/http_message_object.c
index a965a66f950a33aefeb987d176c191f6ad5335d9..f741e65754ea7bdeebe2976d9c9861ff985444c9 100644
(file)
--- a/
http_message_object.c
+++ b/
http_message_object.c
@@
-16,19
+16,16
@@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+
+#include "php_http.h"
#ifdef ZEND_ENGINE_2
#ifdef ZEND_ENGINE_2
-#include "php_http.h"
#include "php_http_api.h"
#include "php_http_api.h"
-#include "php_http_
std_defs
.h"
+#include "php_http_
message_api
.h"
#include "php_http_message_object.h"
#include "php_http_exception_object.h"
#include "php_http_message_object.h"
#include "php_http_exception_object.h"
-#include "phpstr/phpstr.h"
-#include "missing.h"
-
#ifndef WONKY
# include "zend_interfaces.h"
# if defined(HAVE_SPL)
#ifndef WONKY
# include "zend_interfaces.h"
# if defined(HAVE_SPL)
@@
-457,9
+454,7
@@
static void _http_message_object_write_prop(zval *object, zval *member, zval *va
default:
#ifdef WONKY
default:
#ifdef WONKY
- zval_ptr_dtor(&cpy);
zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
- return;
#endif
break;
}
#endif
break;
}
@@
-556,7
+551,7
@@
PHP_METHOD(HttpMessage, __construct)
http_message *msg = obj->message;
http_message_dtor(msg);
http_message *msg = obj->message;
http_message_dtor(msg);
- if (
obj->message = http_message_parse_ex(msg, message, length
)) {
+ if (
(obj->message = http_message_parse_ex(msg, message, length)
)) {
if (obj->message->parent) {
obj->parent = http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL);
}
if (obj->message->parent) {
obj->parent = http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL);
}
@@
-592,7
+587,7
@@
PHP_METHOD(HttpMessage, fromString)
SET_EH_THROW_HTTP();
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
SET_EH_THROW_HTTP();
if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &string, &length)) {
- if (
msg = http_message_parse(string, length
)) {
+ if (
(msg = http_message_parse(string, length)
)) {
ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL));
}
}
ZVAL_OBJVAL(return_value, http_message_object_new_ex(http_message_object_ce, msg, NULL));
}
}