projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
5aa9589
)
- fix cloning if there's no curl handle yet
author
Michael Wallner
<mike@php.net>
Sat, 7 Jan 2006 17:19:39 +0000
(17:19 +0000)
committer
Michael Wallner
<mike@php.net>
Sat, 7 Jan 2006 17:19:39 +0000
(17:19 +0000)
http_request_object.c
patch
|
blob
|
history
diff --git
a/http_request_object.c
b/http_request_object.c
index ad6e43202b1b421c88773427ad1dd2e06d89675d..c7d19c211517c16afaf4e8b868e7884603837f87 100644
(file)
--- a/
http_request_object.c
+++ b/
http_request_object.c
@@
-337,8
+337,10
@@
zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC)
getObject(http_request_object, old_obj);
old_zo = zend_objects_get_address(this_ptr TSRMLS_CC);
getObject(http_request_object, old_obj);
old_zo = zend_objects_get_address(this_ptr TSRMLS_CC);
- new_ov = http_request_object_new_ex(old_zo->ce, curl_easy_duphandle(old_obj->request->ch), &new_obj);
- http_curl_init_ex(new_obj->request->ch, new_obj->request, new_obj->request->_error);
+ new_ov = http_request_object_new_ex(old_zo->ce, NULL, &new_obj);
+ if (old_obj->request->ch) {
+ new_obj->request->ch = http_curl_init_ex(curl_easy_duphandle(old_obj->request->ch), new_obj->request, new_obj->request->_error);
+ }
zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
phpstr_append(&new_obj->history, old_obj->history.data, old_obj->history.used);
zend_objects_clone_members(&new_obj->zo, new_ov, old_zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC);
phpstr_append(&new_obj->history, old_obj->history.data, old_obj->history.used);