From: Ryan Dahl <ry@tinyclouds.org>
Date: Fri, 16 Dec 2011 21:57:36 +0000 (-0800)
Subject: Merge remote branch 'origin/v0.6'
X-Git-Tag: v0.7.0~115
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1865b11dcb77b452ef84fac6970cc742b387dfab;p=platform%2Fupstream%2Fnodejs.git

Merge remote branch 'origin/v0.6'

Conflicts:
	wscript
---

1865b11dcb77b452ef84fac6970cc742b387dfab
diff --cc Makefile
index bf10701,fa62089..b195f2e
--- a/Makefile
+++ b/Makefile
@@@ -75,10 -86,24 +75,24 @@@ website_files = 
  	out/doc/sh_vim-dark.css \
  	out/doc/logo.png      \
  	out/doc/sponsored.png \
-   out/doc/favicon.ico   \
- 	out/doc/pipe.css
+ 	out/doc/favicon.ico   \
+ 	out/doc/pipe.css \
+ 	out/doc/about/index.html \
+ 	out/doc/close-downloads.png \
+ 	out/doc/community/index.html \
+ 	out/doc/community/not-invented-here.png \
+ 	out/doc/download-logo.png \
+ 	out/doc/ebay-logo.png \
+ 	out/doc/footer-logo.png \
+ 	out/doc/icons.png \
+ 	out/doc/linkedin-logo.png \
+ 	out/doc/logos/index.html \
+ 	out/doc/microsoft-logo.png \
+ 	out/doc/platform-icons.png \
+ 	out/doc/ryan-speaker.jpg \
+ 	out/doc/yahoo-logo.png
  
 -doc docs: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
 +doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
  
  $(apidoc_dirs):
  	mkdir -p $@
diff --cc src/node_crypto.cc
index 83a66e3,9f73df3..eb040eb
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@@ -2577,16 -2598,14 +2585,17 @@@ class Decipher : public ObjectWrap 
  
      Decipher *cipher = ObjectWrap::Unwrap<Decipher>(args.This());
  
 -    unsigned char* out_value;
 -    int out_len;
 +    unsigned char* out_value = NULL;
 +    int out_len = -1;
      Local<Value> outString;
  
-     int r = cipher->DecipherFinal(&out_value, &out_len, false);
+     int r = cipher->DecipherFinal<TOLERATE_PADDING>(&out_value, &out_len);
  
 +    assert(out_value != NULL);
 +    assert(out_len != -1);
 +
      if (out_len == 0 || r == 0) {
+       delete[] out_value;
        return scope.Close(String::New(""));
      }