← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/http_digest.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/http_digest.c
5
5
 *                            | (__| |_| |  _ <| |___
6
6
 *                             \___|\___/|_| \_\_____|
7
7
 *
8
 
 * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
 
8
 * Copyright (C) 1998 - 2011, 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
38
38
#include "strtok.h"
39
39
#include "url.h" /* for Curl_safefree() */
40
40
#include "curl_memory.h"
41
 
#include "easyif.h" /* included for Curl_convert_... prototypes */
 
41
#include "non-ascii.h" /* included for Curl_convert_... prototypes */
42
42
 
43
43
#define _MPRINTF_REPLACE /* use our functions only */
44
44
#include <curl/mprintf.h>
294
294
 
295
295
  struct SessionHandle *data = conn->data;
296
296
  struct digestdata *d;
297
 
#ifdef CURL_DOES_CONVERSIONS
298
297
  CURLcode rc;
299
298
/* The CURL_OUTPUT_DIGEST_CONV macro below is for non-ASCII machines.
300
299
   It converts digest text to ASCII so the MD5 will be correct for
306
305
    free(b); \
307
306
    return rc; \
308
307
  }
309
 
#else
310
 
#define CURL_OUTPUT_DIGEST_CONV(a, b)
311
 
#endif /* CURL_DOES_CONVERSIONS */
312
308
 
313
309
  if(proxy) {
314
310
    d = &data->state.proxydigest;