← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/curl/oneiric-security

« back to all changes in this revision

Viewing changes to lib/cookie.c

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-26 02:50:18 UTC
  • mfrom: (3.4.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110126025018-dzgm2m2t5d1vc9y4
Tags: 7.21.3-1ubuntu1
https://launchpad.net/bugs/707756
* Merge from debian unstable.  Remaining changes: (LP: #707756)
  - 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.
    Above changes are necessary to be independent from the universe.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/cookie.c
353
353
              break;
354
354
            }
355
355
            co->expires =
356
 
              atoi((*co->maxage=='\"')?&co->maxage[1]:&co->maxage[0]) +
357
 
              (long)now;
 
356
              strtol((*co->maxage=='\"')?&co->maxage[1]:&co->maxage[0],NULL,10)
 
357
                + (long)now;
358
358
          }
359
359
          else if(Curl_raw_equal("expires", name)) {
360
360
            strstore(&co->expirestr, whatptr);