← Back to branch summary

~ubuntu-branches/ubuntu/natty/curl/natty-security

« back to all changes in this revision

Viewing changes to lib/multiif.h

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-11-29 17:26:37 UTC
  • mfrom: (3.4.9 sid)
  • Revision ID: james.westby@ubuntu.com-20101129172637-7wwnlut14uxp2kfx
Tags: 7.21.2-1ubuntu1
https://launchpad.net/bugs/682286
* Merge with Debian unstable, remaining Ubuntu changes: (LP: #682286)
* debian/control:
  - (Keep build deps in main)
  - Drop build dependencies: stunnel, libssh2-1-dev
  - Add build-dependency on openssh-server
  - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/multiif.h
7
7
 *                            | (__| |_| |  _ <| |___
8
8
 *                             \___|\___/|_| \_\_____|
9
9
 *
10
 
 * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
 
10
 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
11
11
 *
12
12
 * This software is licensed as described in the file COPYING, which
13
13
 * you should have received as part of this distribution. The terms
27
27
 */
28
28
void Curl_expire(struct SessionHandle *data, long milli);
29
29
 
30
 
void Curl_multi_rmeasy(void *multi, CURL *data);
31
 
 
32
30
bool Curl_multi_canPipeline(const struct Curl_multi* multi);
33
31
void Curl_multi_handlePipeBreak(struct SessionHandle *data);
34
32