Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node-v0.x-archive
base: 001f9b46e72a
Choose a base ref
...
head repository: nodejs/node-v0.x-archive
compare: 4bd5f35889ed
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Dec 2, 2013

  1. tls: reset NPN callbacks after SNI 

    SNI callback selects a new SSL_CTX for the connection, which doesn't
have NPN callbacks set up.
    @indutny
    indutny committed Dec 2, 2013
    Copy the full SHA
    9b8fcff View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v0.10' 

    Conflicts:
	src/node_crypto.cc
	src/node_crypto.h
    @indutny
    indutny committed Dec 2, 2013
    Copy the full SHA
    4bd5f35 View commit details
    Browse the repository at this point in the history