Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 55d5821 + 02699a3 commit 7f1f5c120305f4ec157bea33e038acc57733259e @jeremys jeremys committed Jun 20, 2011
Showing with 68,763 additions and 9,610 deletions.
  1. +0 −22 deps/c-ares/CMakeLists.txt
  2. +0 −21 deps/c-ares/README.node
  3. +0 −112 deps/c-ares/cygwin-ia32/ares_build.h
  4. +0 −513 deps/c-ares/cygwin-ia32/ares_config.h
  5. +0 −513 deps/c-ares/darwin-ia32/ares_config.h
  6. +0 −198 deps/c-ares/darwin-ia32/ares_setup.h
  7. +0 −112 deps/c-ares/darwin-x64/ares_build.h
  8. +0 −513 deps/c-ares/darwin-x64/ares_config.h
  9. +0 −198 deps/c-ares/darwin-x64/ares_setup.h
  10. +0 −112 deps/c-ares/freebsd-ia32/ares_build.h
  11. +0 −513 deps/c-ares/freebsd-ia32/ares_config.h
  12. +0 −198 deps/c-ares/freebsd-ia32/ares_setup.h
  13. +0 −112 deps/c-ares/freebsd-x64/ares_build.h
  14. +0 −513 deps/c-ares/freebsd-x64/ares_config.h
  15. +0 −198 deps/c-ares/freebsd-x64/ares_setup.h
  16. +0 −112 deps/c-ares/linux-arm/ares_build.h
  17. +0 −513 deps/c-ares/linux-arm/ares_config.h
  18. +0 −198 deps/c-ares/linux-arm/ares_setup.h
  19. +0 −112 deps/c-ares/linux-ia32/ares_build.h
  20. +0 −513 deps/c-ares/linux-ia32/ares_config.h
  21. +0 −198 deps/c-ares/linux-ia32/ares_setup.h
  22. +0 −112 deps/c-ares/linux-x64/ares_build.h
  23. +0 −513 deps/c-ares/linux-x64/ares_config.h
  24. +0 −198 deps/c-ares/linux-x64/ares_setup.h
  25. +0 −112 deps/c-ares/openbsd-ia32/ares_build.h
  26. +0 −513 deps/c-ares/openbsd-ia32/ares_config.h
  27. +0 −198 deps/c-ares/openbsd-ia32/ares_setup.h
  28. +0 −112 deps/c-ares/openbsd-x64/ares_build.h
  29. +0 −513 deps/c-ares/openbsd-x64/ares_config.h
  30. +0 −198 deps/c-ares/openbsd-x64/ares_setup.h
  31. +0 −112 deps/c-ares/sunos-ia32/ares_build.h
  32. +0 −198 deps/c-ares/sunos-ia32/ares_setup.h
  33. +0 −111 deps/c-ares/win32-ia32/ares_build.h
  34. +0 −513 deps/c-ares/win32-ia32/ares_config.h
  35. +0 −198 deps/c-ares/win32-ia32/ares_setup.h
  36. +0 −26 deps/c-ares/wscript
  37. +15 −0 deps/uv/.gitignore
  38. +1 −0 deps/uv/AUTHORS
  39. 0 deps/{ → uv}/c-ares/AUTHORS
  40. 0 deps/{ → uv}/c-ares/CHANGES
  41. +169 −0 deps/uv/c-ares/Makefile.Watcom
  42. +175 −0 deps/uv/c-ares/Makefile.am
  43. +85 −0 deps/uv/c-ares/Makefile.dj
  44. +1,401 −0 deps/uv/c-ares/Makefile.in
  45. +192 −0 deps/uv/c-ares/Makefile.inc
  46. +68 −0 deps/uv/c-ares/Makefile.m32
  47. +476 −0 deps/uv/c-ares/Makefile.msvc
  48. +434 −0 deps/uv/c-ares/Makefile.netware
  49. 0 deps/{ → uv}/c-ares/NEWS
  50. 0 deps/{ → uv}/c-ares/README
  51. 0 deps/{ → uv}/c-ares/README.cares
  52. 0 deps/{ → uv}/c-ares/README.msvc
  53. 0 deps/{ → uv}/c-ares/RELEASE-NOTES
  54. 0 deps/{ → uv}/c-ares/TODO
  55. +1,925 −0 deps/uv/c-ares/acinclude.m4
  56. +931 −0 deps/uv/c-ares/aclocal.m4
  57. +627 −0 deps/uv/c-ares/acountry.c
  58. +819 −0 deps/uv/c-ares/adig.c
  59. +201 −0 deps/uv/c-ares/ahost.c
  60. 0 deps/{ → uv}/c-ares/ares.h
  61. 0 deps/{ → uv}/c-ares/ares__close_sockets.c
  62. 0 deps/{ → uv}/c-ares/ares__get_hostent.c
  63. 0 deps/{ → uv}/c-ares/ares__read_line.c
  64. 0 deps/{ → uv}/c-ares/ares__timeval.c
  65. +252 −0 deps/uv/c-ares/ares_build.h
  66. +6 −8 deps/{c-ares/darwin-ia32/ares_build.h → uv/c-ares/ares_build.h.in}
  67. +43 −0 deps/uv/c-ares/ares_cancel.3
  68. 0 deps/{ → uv}/c-ares/ares_cancel.c
  69. +166 −167 deps/{c-ares/sunos-ia32/ares_config.h → uv/c-ares/ares_config.h.in}
  70. 0 deps/{ → uv}/c-ares/ares_data.c
  71. 0 deps/{ → uv}/c-ares/ares_data.h
  72. +43 −0 deps/uv/c-ares/ares_destroy.3
  73. 0 deps/{ → uv}/c-ares/ares_destroy.c
  74. +38 −0 deps/uv/c-ares/ares_destroy_options.3
  75. 0 deps/{ → uv}/c-ares/ares_dns.h
  76. +43 −0 deps/uv/c-ares/ares_dup.3
  77. +63 −0 deps/uv/c-ares/ares_expand_name.3
  78. 0 deps/{ → uv}/c-ares/ares_expand_name.c
  79. +61 −0 deps/uv/c-ares/ares_expand_string.3
  80. 0 deps/{ → uv}/c-ares/ares_expand_string.c
  81. +61 −0 deps/uv/c-ares/ares_fds.3
  82. 0 deps/{ → uv}/c-ares/ares_fds.c
  83. +72 −0 deps/uv/c-ares/ares_free_data.3
  84. +45 −0 deps/uv/c-ares/ares_free_hostent.3
  85. 0 deps/{ → uv}/c-ares/ares_free_hostent.c
  86. +35 −0 deps/uv/c-ares/ares_free_string.3
  87. 0 deps/{ → uv}/c-ares/ares_free_string.c
  88. +78 −0 deps/uv/c-ares/ares_get_servers.3
  89. +101 −0 deps/uv/c-ares/ares_gethostbyaddr.3
  90. 0 deps/{ → uv}/c-ares/ares_gethostbyaddr.c
  91. +105 −0 deps/uv/c-ares/ares_gethostbyname.3
  92. 0 deps/{ → uv}/c-ares/ares_gethostbyname.c
  93. +83 −0 deps/uv/c-ares/ares_gethostbyname_file.3
  94. +149 −0 deps/uv/c-ares/ares_getnameinfo.3
  95. 0 deps/{ → uv}/c-ares/ares_getnameinfo.c
  96. 0 deps/{ → uv}/c-ares/ares_getopt.c
  97. 0 deps/{ → uv}/c-ares/ares_getopt.h
  98. +57 −0 deps/uv/c-ares/ares_getsock.3
  99. 0 deps/{ → uv}/c-ares/ares_getsock.c
  100. +223 −0 deps/uv/c-ares/ares_init.3
  101. 0 deps/{ → uv}/c-ares/ares_init.c
  102. +1 −0 deps/uv/c-ares/ares_init_options.3
  103. 0 deps/{ → uv}/c-ares/ares_ipv6.h
  104. +73 −0 deps/uv/c-ares/ares_library_cleanup.3
  105. +96 −0 deps/uv/c-ares/ares_library_init.3
  106. 0 deps/{ → uv}/c-ares/ares_library_init.c
  107. 0 deps/{ → uv}/c-ares/ares_library_init.h
  108. 0 deps/{ → uv}/c-ares/ares_llist.c
  109. 0 deps/{ → uv}/c-ares/ares_llist.h
  110. +75 −0 deps/uv/c-ares/ares_mkquery.3
  111. 0 deps/{ → uv}/c-ares/ares_mkquery.c
  112. 0 deps/{ → uv}/c-ares/ares_nowarn.c
  113. 0 deps/{ → uv}/c-ares/ares_nowarn.h
  114. 0 deps/{ → uv}/c-ares/ares_options.c
  115. +78 −0 deps/uv/c-ares/ares_parse_a_reply.3
  116. 0 deps/{ → uv}/c-ares/ares_parse_a_reply.c
  117. +78 −0 deps/uv/c-ares/ares_parse_aaaa_reply.3
  118. 0 deps/{ → uv}/c-ares/ares_parse_aaaa_reply.c
  119. +79 −0 deps/uv/c-ares/ares_parse_mx_reply.3
  120. 0 deps/{ → uv}/c-ares/ares_parse_mx_reply.c
  121. +66 −0 deps/uv/c-ares/ares_parse_ns_reply.3
  122. 0 deps/{ → uv}/c-ares/ares_parse_ns_reply.c
  123. +74 −0 deps/uv/c-ares/ares_parse_ptr_reply.3
  124. 0 deps/{ → uv}/c-ares/ares_parse_ptr_reply.c
  125. +81 −0 deps/uv/c-ares/ares_parse_srv_reply.3
  126. 0 deps/{ → uv}/c-ares/ares_parse_srv_reply.c
  127. +80 −0 deps/uv/c-ares/ares_parse_txt_reply.3
  128. 0 deps/{ → uv}/c-ares/ares_parse_txt_reply.c
  129. 0 deps/{ → uv}/c-ares/ares_private.h
  130. +80 −0 deps/uv/c-ares/ares_process.3
  131. 0 deps/{ → uv}/c-ares/ares_process.c
  132. +146 −0 deps/uv/c-ares/ares_query.3
  133. 0 deps/{ → uv}/c-ares/ares_query.c
  134. 0 deps/{ → uv}/c-ares/ares_rules.h
  135. +74 −0 deps/uv/c-ares/ares_save_options.3
  136. +148 −0 deps/uv/c-ares/ares_search.3
  137. 0 deps/{ → uv}/c-ares/ares_search.c
  138. +120 −0 deps/uv/c-ares/ares_send.3
  139. 0 deps/{ → uv}/c-ares/ares_send.c
  140. +84 −0 deps/uv/c-ares/ares_set_servers.3
  141. +28 −0 deps/uv/c-ares/ares_set_socket_callback.3
  142. +0 −1 deps/{c-ares/cygwin-ia32 → uv/c-ares}/ares_setup.h
  143. 0 deps/{ → uv}/c-ares/ares_strcasecmp.c
  144. 0 deps/{ → uv}/c-ares/ares_strcasecmp.h
  145. 0 deps/{ → uv}/c-ares/ares_strdup.c
  146. 0 deps/{ → uv}/c-ares/ares_strdup.h
  147. +37 −0 deps/uv/c-ares/ares_strerror.3
  148. 0 deps/{ → uv}/c-ares/ares_strerror.c
  149. +61 −0 deps/uv/c-ares/ares_timeout.3
  150. 0 deps/{ → uv}/c-ares/ares_timeout.c
  151. +40 −0 deps/uv/c-ares/ares_version.3
  152. 0 deps/{ → uv}/c-ares/ares_version.c
  153. 0 deps/{ → uv}/c-ares/ares_version.h
  154. 0 deps/{ → uv}/c-ares/ares_writev.c
  155. 0 deps/{ → uv}/c-ares/ares_writev.h
  156. 0 deps/{ → uv}/c-ares/bitncmp.c
  157. 0 deps/{ → uv}/c-ares/bitncmp.h
  158. +117 −0 deps/uv/c-ares/buildconf
  159. +65 −0 deps/uv/c-ares/cares.rc
  160. +142 −0 deps/uv/c-ares/compile
  161. +114 −0 deps/uv/c-ares/config-dos.h
  162. 0 deps/{ → uv}/c-ares/config-win32.h
  163. +1,502 −0 deps/uv/c-ares/config.guess
  164. +1,714 −0 deps/uv/c-ares/config.sub
  165. +27,058 −0 deps/uv/c-ares/configure
  166. +889 −0 deps/uv/c-ares/configure.ac
  167. +530 −0 deps/uv/c-ares/depcomp
  168. 0 deps/{ → uv}/c-ares/get_ver.awk
  169. 0 deps/{ → uv}/c-ares/inet_net_pton.c
  170. 0 deps/{ → uv}/c-ares/inet_net_pton.h
  171. 0 deps/{ → uv}/c-ares/inet_ntop.c
  172. 0 deps/{ → uv}/c-ares/inet_ntop.h
  173. +250 −0 deps/uv/c-ares/install-sh
  174. +20 −0 deps/uv/c-ares/libcares.pc.in
  175. +8,413 −0 deps/uv/c-ares/ltmain.sh
  176. +1,551 −0 deps/uv/c-ares/m4/cares-compilers.m4
  177. +352 −0 deps/uv/c-ares/m4/cares-confopts.m4
  178. +3,235 −0 deps/uv/c-ares/m4/cares-functions.m4
  179. +102 −0 deps/uv/c-ares/m4/cares-override.m4
  180. +611 −0 deps/uv/c-ares/m4/cares-reentrant.m4
  181. +83 −0 deps/uv/c-ares/m4/cares-system.m4
  182. +7,377 −0 deps/uv/c-ares/m4/libtool.m4
  183. +368 −0 deps/uv/c-ares/m4/ltoptions.m4
  184. +123 −0 deps/uv/c-ares/m4/ltsugar.m4
  185. +23 −0 deps/uv/c-ares/m4/ltversion.m4
  186. +92 −0 deps/uv/c-ares/m4/lt~obsolete.m4
  187. +74 −0 deps/uv/c-ares/maketgz
  188. +360 −0 deps/uv/c-ares/missing
  189. +39 −0 deps/uv/c-ares/mkinstalldirs
  190. 0 deps/{ → uv}/c-ares/nameser.h
  191. 0 deps/{ → uv}/c-ares/setup_once.h
  192. +170 −0 deps/uv/c-ares/vc/acountry/vc6acountry.dsp
  193. +170 −0 deps/uv/c-ares/vc/adig/vc6adig.dsp
  194. +170 −0 deps/uv/c-ares/vc/ahost/vc6ahost.dsp
  195. +397 −0 deps/uv/c-ares/vc/cares/vc6cares.dsp
  196. +29 −0 deps/uv/c-ares/vc/cares/vc6cares.dsw
  197. +74 −0 deps/uv/c-ares/vc/vc6aws.dsw
  198. 0 deps/{ → uv}/c-ares/windows_port.c
  199. +10 −3 deps/uv/config-mingw.mk
  200. +31 −2 deps/uv/config-unix.mk
  201. +179 −0 deps/uv/msvs/c-ares.vcxproj
  202. +10 −0 deps/uv/msvs/libuv.sln
  203. +10 −0 deps/uv/msvs/libuv.vcxproj
  204. +14 −0 deps/uv/test/test-bind-error.c
  205. +35 −0 deps/uv/test/test-hrtime.c
  206. +6 −0 deps/uv/test/test-list.h
  207. +15 −1 deps/uv/uv-common.c
  208. +64 −0 deps/uv/uv-darwin.c
  209. +49 −0 deps/uv/uv-freebsd.c
  210. +52 −0 deps/uv/uv-linux.c
  211. +36 −0 deps/uv/uv-sunos.c
  212. +0 −66 deps/uv/uv-unix.c
  213. +36 −35 deps/uv/uv-win.c
  214. +59 −3 deps/uv/uv.h
  215. +6 −4 doc/api/crypto.markdown
  216. +18 −0 doc/api/modules.markdown
  217. +1 −1 lib/child_process.js
  218. +0 −16 lib/module.js
  219. 0 lib/{net.js → net_legacy.js}
  220. +449 −0 lib/net_uv.js
  221. +1 −1 lib/tty_posix.js
  222. +6 −1 lib/util.js
  223. +16 −5 src/node.cc
  224. +17 −17 src/node.js
  225. +0 −3 src/node_buffer.h
  226. +55 −21 src/node_crypto.cc
  227. +328 −44 src/tcp_wrap.cc
  228. +6 −3 src/timer_wrap.cc
  229. +4 −4 test/common.js
  230. +15 −0 test/fixtures/test_rsa_privkey.pem
  231. +6 −0 test/fixtures/test_rsa_pubkey.pem
  232. +17 −0 test/simple/test-crypto.js
  233. +4 −1 test/simple/test-os.js
  234. +50 −0 test/simple/test-tcp-wrap-connect.js
  235. +95 −0 test/simple/test-tcp-wrap-listen.js
  236. +0 −60 tools/covhtml.js
  237. +7 −22 wscript
View
@@ -1,22 +0,0 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${node_platform}-${cares_arch})
-add_definitions(-DHAVE_CONFIG_H=1)
-
-include(CheckLibraryExists)
-check_library_exists(socket socket "" HAVE_SOCKET_LIB)
-check_library_exists(nsl gethostbyname "" HAVE_NSL_LIB)
-
-file(GLOB lib_sources *.c)
-add_library(cares ${lib_sources})
-
-if(${HAVE_SOCKET_LIB})
- set(cares_libs ${cares_libs} socket)
-endif()
-
-if(${HAVE_NSL_LIB})
- set(cares_libs ${cares_libs} nsl)
-endif()
-
-if(cares_libs)
- target_link_libraries(cares ${cares_libs})
-endif()
View
@@ -1,21 +0,0 @@
-Library: c-ares, DNS resolver
-
-Version: 1.7.3 (11 June, 2010)
-
-Authors: Greg Hudson, Daniel Stenberg
-
-License: MIT
-
-Notes:
-
-Just use waf instead of the autoconf based configure script. Delete most of
-the documentation and other files distributed with it. To upgrade, run
-./configure on linux, macintosh, solaris (and other supported platforms) and
-copy
-- ares_config.h
-- ares_setup.h
-- ares_build.h
-into the appropriate directory.
-
-
-
@@ -1,112 +0,0 @@
-/* ares_build.h. Generated from ares_build.h.in by configure. */
-#ifndef __CARES_BUILD_H
-#define __CARES_BUILD_H
-
-/* $Id$ */
-
-/* Copyright (C) 2009 by Daniel Stenberg et al
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. M.I.T. makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- */
-
-/* ================================================================ */
-/* NOTES FOR CONFIGURE CAPABLE SYSTEMS */
-/* ================================================================ */
-
-/*
- * NOTE 1:
- * -------
- *
- * Nothing in this file is intended to be modified or adjusted by the
- * c-ares library user nor by the c-ares library builder.
- *
- * If you think that something actually needs to be changed, adjusted
- * or fixed in this file, then, report it on the c-ares development
- * mailing list: http://cool.haxx.se/mailman/listinfo/c-ares/
- *
- * This header file shall only export symbols which are 'cares' or 'CARES'
- * prefixed, otherwise public name space would be polluted.
- *
- * NOTE 2:
- * -------
- *
- * Right now you might be staring at file ares_build.h.in or ares_build.h,
- * this is due to the following reason:
- *
- * On systems capable of running the configure script, the configure process
- * will overwrite the distributed ares_build.h file with one that is suitable
- * and specific to the library being configured and built, which is generated
- * from the ares_build.h.in template file.
- *
- */
-
-/* ================================================================ */
-/* DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE */
-/* ================================================================ */
-
-#ifdef CARES_SIZEOF_LONG
-# error "CARES_SIZEOF_LONG shall not be defined except in ares_build.h"
- Error Compilation_aborted_CARES_SIZEOF_LONG_already_defined
-#endif
-
-#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
-# error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
- Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-#ifdef CARES_SIZEOF_ARES_SOCKLEN_T
-# error "CARES_SIZEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
- Error Compilation_aborted_CARES_SIZEOF_ARES_SOCKLEN_T_already_defined
-#endif
-
-/* ================================================================ */
-/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */
-/* ================================================================ */
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file ws2tcpip.h must be included by the external interface. */
-/* #undef CARES_PULL_WS2TCPIP_H */
-#ifdef CARES_PULL_WS2TCPIP_H
-# ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# endif
-# include <windows.h>
-# include <winsock2.h>
-# include <ws2tcpip.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file sys/types.h must be included by the external interface. */
-#define CARES_PULL_SYS_TYPES_H 1
-#ifdef CARES_PULL_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-/* Configure process defines this to 1 when it finds out that system */
-/* header file sys/socket.h must be included by the external interface. */
-#define CARES_PULL_SYS_SOCKET_H 1
-#ifdef CARES_PULL_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-
-/* The size of `long', as computed by sizeof. */
-#define CARES_SIZEOF_LONG 4
-
-/* Integral data type used for ares_socklen_t. */
-#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
-
-/* The size of `ares_socklen_t', as computed by sizeof. */
-#define CARES_SIZEOF_ARES_SOCKLEN_T 4
-
-/* Data type definition of ares_socklen_t. */
-typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
-
-#endif /* __CARES_BUILD_H */
Oops, something went wrong.

0 comments on commit 7f1f5c1

Please sign in to comment.