Merge remote-tracking branch 'origin/v0.10'

Conflicts:
	AUTHORS
	ChangeLog
	deps/uv/ChangeLog
	deps/uv/src/version.c
	deps/uv/src/win/fs.c
	src/node.cc
	src/node_crypto.cc
	src/node_os.cc
	src/node_version.h
This commit is contained in:
Ben Noordhuis committed 2013-07-30 15:19:48 +02:00
commit b8c04b921b
209 files changed
+1585 -1290

No files matched your search

+7
View File
@@ -338,6 +338,13 @@ size_t StringBytes::Write(char* buf,
}
bool StringBytes::IsValidString(Handle<String> string, enum encoding enc) {
if (enc == HEX && string->Length() % 2 != 0) return false;
// TODO(bnoordhuis) Add BASE64 check?
return true;
}
// Quick and dirty size calculation
// Will always be at least big enough, but may have some extra
// UTF8 can be as much as 3x the size, Base64 can have 1-2 extra bytes