forks/node-curl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes failed on curl_multi_perform cause curl_multi_remove failed

Browse source
This commit is contained in:
jiangfriend@gmail.com 2012-02-16 00:25:55 +08:00
parent 2ccaa44f2f
commit f65257623b
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -2,7 +2,7 @@
"name": "node-curl", "name": "node-curl",
"version": "0.1.0", "version": "0.1.0",
"author" : "Jiang Miao <jiangfriend@gmail.com>", "author" : "Jiang Miao <jiangfriend@gmail.com>",
"description": "node wrapper for multi curl, full implemented.", "description": "node wrapper for multi curl, fully implemented.",
"keywords" : ["node-curl", "curl", "multi-curl", "mcurl"], "keywords" : ["node-curl", "curl", "multi-curl", "mcurl"],
"homepage": "http://github.com/jiangmiao/node-curl", "homepage": "http://github.com/jiangmiao/node-curl",
"repository" : { "repository" : {

20
src/node-curl.h
View file

@ -1,8 +1,6 @@
#ifndef NODE_CURL_NOHE_CURL_H #ifndef NODE_CURL_NOHE_CURL_H
#define NODE_CURL_NOHE_CURL_H #define NODE_CURL_NOHE_CURL_H
#include <unistd.h>
#include <v8.h> #include <v8.h>
#include <node.h> #include <node.h>
#include <node_buffer.h> #include <node_buffer.h>
@ -327,18 +325,22 @@ class NodeCurl
if (msg->msg == CURLMSG_DONE) if (msg->msg == CURLMSG_DONE)
{ {
NodeCurl * curl = curls[msg->easy_handle]; NodeCurl * curl = curls[msg->easy_handle];
// ensure curl still exists, // copy CURLMsg
// gc will delete the curl if there is no reference. // on_error may delete the whole NodeCurl
if (msg->data.result == CURLE_OK) CURLMsg msg_copy = *msg;
curl->on_end(msg);
else
curl->on_error(msg);
code = curl_multi_remove_handle(curlm, msg->easy_handle); code = curl_multi_remove_handle(curlm, msg->easy_handle);
curl->in_curlm = false; curl->in_curlm = false;
if (code != CURLM_OK) if (code != CURLM_OK)
{ {
return raise("curl_multi_remove_handle failed", curl_multi_strerror(code)); return raise("curl_multi_remove_handle failed", curl_multi_strerror(code));
} }
// ensure curl still exists,
// gc will delete the curl if there is no reference.
if (msg_copy.data.result == CURLE_OK)
curl->on_end(&msg_copy);
else
curl->on_error(&msg_copy);
} }
} }
} }
@ -350,11 +352,11 @@ class NodeCurl
{ {
NodeCurl *curl = unwrap(args.This()); NodeCurl *curl = unwrap(args.This());
CURLMcode code = curl_multi_add_handle(curlm, curl->curl); CURLMcode code = curl_multi_add_handle(curlm, curl->curl);
curl->in_curlm = true;
if (code != CURLM_OK) if (code != CURLM_OK)
{ {
return raise("curl_multi_add_handle failed", curl_multi_strerror(code)); return raise("curl_multi_add_handle failed", curl_multi_strerror(code));
} }
curl->in_curlm = true;
++running_handles; ++running_handles;
return args.This(); return args.This();
} }