Commit 57ccdfa8 authored by Zdenek Pavlas's avatar Zdenek Pavlas Committed by Kamil Dudka
Browse files

curl_global_init: accept the CURL_GLOBAL_ACK_EINTR flag 

The flag can be used in pycurl-based applications where using the multi
interface would not be acceptable because of the performance lost caused
by implementing the select() loop in python.

Bug: http://curl.haxx.se/bug/view.cgi?id=1168
Downstream Bug: https://bugzilla.redhat.com/919127
parent 491e026c

RELEASE-NOTES

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ This release includes the following changes: 
 o darwinssl: Make certificate errors less techy

 o imap/pop3/smtp: Added support for the STARTTLS capability

 o checksrc: ban use of sprintf, vsprintf, strcat, strncat and gets

 o curl_global_init() now accepts the CURL_GLOBAL_ACK_EINTR flag [10]



This release includes the following bugfixes:
@@ -81,3 +82,4 @@ References to bug reports and discussions on issues: 
 [7] = http://curl.haxx.se/bug/view.cgi?id=1190

 [8] = http://curl.haxx.se/bug/view.cgi?id=1193

 [9] = http://curl.haxx.se/bug/view.cgi?id=1194

 [10] = http://curl.haxx.se/bug/view.cgi?id=1168

docs/libcurl/curl_global_init.3

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ Initialise nothing extra. This sets no bit. 
.B CURL_GLOBAL_DEFAULT

A sensible default. It will init both SSL and Win32. Right now, this equals

the functionality of the \fBCURL_GLOBAL_ALL\fP mask.

.TP

.B CURL_GLOBAL_ACK_EINTR

When this flag is set, curl will acknowledge EINTR condition when connecting

or when waiting for data.  Otherwise, curl waits until full timeout elapses.

.SH RETURN VALUE

If this function returns non-zero, something went wrong and you cannot use the

other curl functions.

docs/libcurl/symbols-in-versions

+1 −0
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ CURL_GLOBAL_DEFAULT 7.8 
CURL_GLOBAL_NOTHING             7.8

CURL_GLOBAL_SSL                 7.8

CURL_GLOBAL_WIN32               7.8.1

CURL_GLOBAL_ACK_EINTR           7.30.0

CURL_HTTP_VERSION_1_0           7.9.1

CURL_HTTP_VERSION_1_1           7.9.1

CURL_HTTP_VERSION_NONE          7.9.1

include/curl/curl.h

+1 −0
Original line number Diff line number Diff line
@@ -2015,6 +2015,7 @@ typedef enum { 
#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32)

#define CURL_GLOBAL_NOTHING 0

#define CURL_GLOBAL_DEFAULT CURL_GLOBAL_ALL

#define CURL_GLOBAL_ACK_EINTR (1<<2)





/*****************************************************************************

lib/easy.c

+2 −0
Original line number Diff line number Diff line
@@ -262,6 +262,8 @@ CURLcode curl_global_init(long flags) 
  }

#endif



  Curl_ack_eintr = flags & CURL_GLOBAL_ACK_EINTR;



  init_flags  = flags;



  /* Preset pseudo-random number sequence. */