← Back to branch summary

~ubuntu-branches/ubuntu/utopic/curl/utopic-updates

« back to all changes in this revision

Viewing changes to lib/security.c

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2011-05-02 19:12:31 UTC
  • mfrom: (3.4.17 sid)
  • Revision ID: james.westby@ubuntu.com-20110502191231-1hiklg06nzo62ws8
Tags: 7.21.6-1ubuntu1
https://launchpad.net/bugs/775794
* Merge from debian unstable (LP: #775794), remaining changes:
  - debian/control:
    + Build-Depends: Replace libssh2-1-dev with openssh-server.
      Drop stunnel since it's in universe, as well.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/security.c
147
147
}
148
148
 
149
149
/* Read |len| from the socket |fd| and store it in |to|. Return a CURLcode
150
 
   saying whether an error occured or CURLE_OK if |len| was read. */
 
150
   saying whether an error occurred or CURLE_OK if |len| was read. */
151
151
static CURLcode
152
152
socket_read(curl_socket_t fd, void *to, size_t len)
153
153
{
173
173
 
174
174
 
175
175
/* Write |len| bytes from the buffer |to| to the socket |fd|. Return a
176
 
   CURLcode saying whether an error occured or CURLE_OK if |len| was
 
176
   CURLcode saying whether an error occurred or CURLE_OK if |len| was
177
177
   written. */
178
178
static CURLcode
179
179
socket_write(struct connectdata *conn, curl_socket_t fd, const void *to,