← Back to branch summary

~ubuntu-branches/ubuntu/raring/nss/raring

« back to all changes in this revision

Viewing changes to mozilla/security/nss/lib/ssl/sslsock.c

  • Committer: Package Import Robot
  • Author(s): Jamie Strandboge
  • Date: 2013-03-13 13:37:33 UTC
  • mfrom: (1.1.19) (39.1.3 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20130313133733-wphwfuuxmz0idaze
Tags: 2:3.14.3-0ubuntu1
* New upstream release with merged changes from Debian unstable for
  2:3.14.2-1. Remaining changes:
  - control: Change Vcs-* to XS-Debian-Vcs-*.
  - rules: Include libnssb.a and libnssckfw.a in the -dev package.
* debian/libnss3.symbols: add NSS_3.14.3 symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/security/nss/lib/ssl/sslsock.c
6
6
 * This Source Code Form is subject to the terms of the Mozilla Public
7
7
 * License, v. 2.0. If a copy of the MPL was not distributed with this
8
8
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
9
 
/* $Id: sslsock.c,v 1.98 2012/11/14 01:14:12 wtc%google.com Exp $ */
 
9
/* $Id: sslsock.c,v 1.99 2012/12/20 20:29:36 bsmith%mozilla.com Exp $ */
10
10
#include "seccomon.h"
11
11
#include "cert.h"
12
12
#include "keyhi.h"
2904
2904
        ssl_ChooseOps(ss);
2905
2905
        ssl2_InitSocketPolicy(ss);
2906
2906
        ssl3_InitSocketPolicy(ss);
 
2907
        PR_INIT_CLIST(&ss->ssl3.hs.lastMessageFlight);
2907
2908
 
2908
2909
        if (makeLocks) {
2909
2910
            status = ssl_MakeLocks(ss);