diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-10-18 14:54:23 -0700 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-10-18 14:54:23 -0700 |
| commit | faa042b4e4ec2937f08f8221269e75e920cac215 (patch) | |
| tree | 8fab01bbb7dbc0cf1616ae60d3df92132481ecc3 | |
| parent | 78fe7d0592c53cd0a0c77f32320979eec5d7fadb (diff) | |
| parent | 4421bebc36370b1949b8f4030736af25019555ea (diff) | |
| download | node-faa042b4e4ec2937f08f8221269e75e920cac215.tar.gz | |
Merge branch 'v0.8.26-release' into v0.8
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | src/node_version.h | 2 |
2 files changed, 19 insertions, 2 deletions
@@ -1,4 +1,21 @@ -2013.06.13, Version 0.8.25 (maintenance) +2013.10.13, Version 0.8.26 (maintenance) + +* v8: Upgrade to 3.11.10.26 + +* crypto: clear openssl error stack when handled (Ben Noordhuis) + +* crypto: clear errors from verify failure (Timothy J Fontaine) + +* crypto: fix memory leak in LoadPKCS12 (Fedor Indutny) + +* http: provide backpressure for pipeline flood (isaacs) + +* http_parser: expose pause/resume method for parser (Timothy J Fontaine) + +* readline: pause stdin before turning off terminal raw mode (Daniel Chatfield) + + +2013.06.13, Version 0.8.25 (maintenance), 0b9bdb2bc7e1c872f0ea4713517fda22a4b0b202 * npm: Upgrade to 1.2.30 diff --git a/src/node_version.h b/src/node_version.h index 875f2acf3..7f00ab02d 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -30,7 +30,7 @@ # define NODE_TAG "" #endif -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) |