← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/libtest/lib590.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-05-28 12:21:13 UTC
  • mfrom: (3.4.29 sid)
  • Revision ID: package-import@ubuntu.com-20120528122113-i5f42lajprljoudn
Tags: 7.26.0-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
* Adjust udeb configure flags handling to something easier to merge in
  future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/libtest/lib590.c
5
5
 *                            | (__| |_| |  _ <| |___
6
6
 *                             \___|\___/|_| \_\_____|
7
7
 *
8
 
 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
 
8
 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
9
9
 *
10
10
 * This software is licensed as described in the file COPYING, which
11
11
 * you should have received as part of this distribution. The terms
55
55
  test_setopt(curl, CURLOPT_URL, URL);
56
56
  test_setopt(curl, CURLOPT_HEADER, 1L);
57
57
  test_setopt(curl, CURLOPT_PROXYAUTH,
58
 
              CURLAUTH_BASIC | CURLAUTH_DIGEST | CURLAUTH_NTLM);
 
58
              (long) (CURLAUTH_BASIC | CURLAUTH_DIGEST | CURLAUTH_NTLM));
59
59
  test_setopt(curl, CURLOPT_PROXY, libtest_arg2); /* set in first.c */
60
60
  test_setopt(curl, CURLOPT_PROXYUSERPWD, "me:password");
61
61