Fixed GH-10270 Unable to return CURL_READFUNC_PAUSE in readfunc callback #10607
Conversation
0fa8221 to
98ef7ca
Compare
| @@ -1547,6 +1547,8 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx) | |||
| if (Z_TYPE(retval) == IS_STRING) { | |||
| length = MIN((int) (size * nmemb), Z_STRLEN(retval)); | |||
| memcpy(data, Z_STRVAL(retval), length); | |||
| } else if (Z_TYPE(retval) == IS_LONG) { | |||
There was a problem hiding this comment.
how difficult is it to add a test for the usage of CURL_READFUNC_PAUSE? it would be nice to have one I guess unless it's very compilcated
There was a problem hiding this comment.
I added one, that I know test the code, but what I don't like about it is that there is no way to know that the read is paused. But I guess it's better than nothing.
There was a problem hiding this comment.
Yeah, it's definitely better! Would it make sense to return CURL_READFUNC_PAUSE until a specific amount of time elapses (e.g. 1 sec)? If this makes sense then the test should be tagged as slow
There was a problem hiding this comment.
The CURLOPT_READFUNCTION callback is not called after returning CURL_READFUNC_PAUSE until curl_pause(CURLPAUSE_CONT) is called. So I don't think that it will really improve the test.
98ef7ca to
4410762
Compare
ea34a9b to
2a7d356
Compare
Fixes GH-10270 - If the value returned in the
CURLOPT_READFUNCTIONis an integer then return it. This will allow to return theCURL_READFUNC_PAUSEmagic value.