Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

http: fix agent.getName() and add tests #1617

Closed
wants to merge 50 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e3a4824
test: remove obsolete harmony flags
chrisdickinson May 5, 2015
b26a7cb
deps: update v8 to 4.3.61.21
chrisdickinson May 5, 2015
6950d62
doc: update v8 flags in man page
targos May 14, 2015
0925aba
Revert "dns: remove AI_V4MAPPED hint flag on FreeBSD"
cjihrig Apr 29, 2015
7a3e354
net: do not set V4MAPPED on FreeBSD
Mar 2, 2015
f49aed1
deps: backport 7b24219346 from v8 upstream
rvagg May 27, 2015
1ed4e13
buffer: allow ARGS_THIS to accept a name
trevnorris May 26, 2015
e8734c0
buffer: implement Uint8Array backed Buffer
trevnorris May 26, 2015
e435bf7
buffer: finish implementing FreeCallback
trevnorris Jun 1, 2015
ad91c1d
buffer: switch to using Maybe<T> API
trevnorris Jun 2, 2015
2903030
buffer: switch API to return MaybeLocal<T>
trevnorris Jun 2, 2015
07924b8
buffer: make additional changes to native API
trevnorris Jun 2, 2015
53f8549
crypto: remove kMaxLength on randomBytes()
trevnorris Jun 2, 2015
84c58a3
vm: fix property descriptors of sandbox properties
domenic May 22, 2015
9093ea7
vm: remove unnecessary access checks
domenic May 23, 2015
84950bc
vm: fix symbol access
domenic Jun 1, 2015
1da8ec3
dgram: make send cb act as "error" event handler
chrisdickinson Jun 5, 2014
59a23ed
dgram: make send cb act as "error" event handler
mcollina May 26, 2015
646d67b
http_server: `prefinish` vs `finish`
indutny Apr 13, 2015
a799038
buffer: fix case of one buffer passed to concat
thefourtheye Jun 10, 2015
309c0f4
cluster: do not unconditionally set --debug-port
cjihrig Jun 11, 2015
74772b4
buffer: fix usage of kMaxLength
trevnorris Jun 17, 2015
f115dfc
buffer: minor cleanup from rebase
trevnorris Jun 17, 2015
197ba00
buffer: allow ArrayBuffer as Buffer argument
trevnorris Jun 17, 2015
90c72d4
readline: allow tabs in input
Trott May 21, 2015
4527bbf
deps: update v8 to 4.4.63.9
bnoordhuis Jun 19, 2015
67d9391
test: don't use arguments.callee
bnoordhuis Jun 19, 2015
8835c3d
test: remove two obsolete pummel tests
bnoordhuis Jun 19, 2015
d15ddea
buffer: rename internal/buffer_new.js to buffer.js
bnoordhuis Jun 19, 2015
6e72ac7
Merge tag 'v2.3.1' into next
bnoordhuis Jun 25, 2015
033a728
build,win: set env before generating projects
orangemocha Apr 23, 2015
0fb8d45
build: add MSVS 2015 support
rvagg Apr 16, 2015
32c6a66
build: fix cherry-pick ooops, fix comment wording
rvagg Jun 23, 2015
c4bba16
build: update build targets for io.js
rvagg Jun 10, 2015
a6bc75d
build: add tar-headers target for headers-only tar
rvagg Jun 14, 2015
bda3a2d
node-gyp: make aware of nightly, next-nightly & rc
rvagg Jun 26, 2015
8f6f428
node-gyp: download header tarball for compile
rvagg Jun 26, 2015
483aac9
Working on v3.0.0
rvagg Jun 30, 2015
bf7df17
deps: upgrade v8 to 4.4.63.12
bnoordhuis Jul 1, 2015
a5745aa
src: increment NODE_MODULE_VERSION to 45
rvagg Jul 2, 2015
8a1986f
src: update comment for NODE_MODULE_VERSION
rvagg Jul 2, 2015
7387297
test: add test for missing `close`/`finish` event
not-implemented Apr 13, 2015
3beae2c
Merge branch 'master' into next
trevnorris Jul 10, 2015
cbec3ee
node: do not override `message`/`stack` of error
indutny Jul 5, 2015
235036e
http: use official IANA Status Codes
jomo Jul 11, 2015
cf9e02d
buffer: fix not return on error
trevnorris Jul 22, 2015
4737dcd
build: first set of updates to enable PPC support
mhdawson Jul 7, 2015
9cf36a1
buffer: fix missing null/undefined check
trevnorris Jul 16, 2015
115bf08
node: remove redundant --use-old-buffer
rvagg Jul 30, 2015
f0de101
http: fix agent.getName() and add tests
brendanashworth May 5, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,17 @@ else
ifeq ($(DESTCPU),arm)
ARCH=arm
else
ifeq ($(DESTCPU),ppc64)
ARCH=ppc64
else
ifeq ($(DESTCPU),ppc)
ARCH=ppc
else
ARCH=x86
endif
endif
endif
endif

# enforce "x86" over "ia32" as the generally accepted way of referring to 32-bit intel
ifeq ($(ARCH),ia32)
Expand Down
8 changes: 8 additions & 0 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,14 @@
'cflags': [ '-m64' ],
'ldflags': [ '-m64' ],
}],
[ 'target_arch=="ppc"', {
'cflags': [ '-m32' ],
'ldflags': [ '-m32' ],
}],
[ 'target_arch=="ppc64"', {
'cflags': [ '-m64', '-mminimal-toc' ],
'ldflags': [ '-m64' ],
}],
[ 'OS=="solaris"', {
'cflags': [ '-pthreads' ],
'ldflags': [ '-pthreads' ],
Expand Down
6 changes: 5 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import nodedownload
parser = optparse.OptionParser()

valid_os = ('win', 'mac', 'solaris', 'freebsd', 'openbsd', 'linux', 'android')
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'x32', 'x64', 'x86')
valid_arch = ('arm', 'arm64', 'ia32', 'mips', 'mipsel', 'ppc', 'ppc64', 'x32',
'x64')
valid_arm_float_abi = ('soft', 'softfp', 'hard')
valid_mips_arch = ('loongson', 'r1', 'r2', 'r6', 'rx')
valid_mips_fpu = ('fp32', 'fp64', 'fpxx')
Expand Down Expand Up @@ -538,6 +539,8 @@ def host_arch_cc():
'__arm__' : 'arm',
'__i386__' : 'ia32',
'__mips__' : 'mips',
'__PPC64__' : 'ppc64',
'__PPC__' : 'ppc',
'__x86_64__' : 'x64',
}

Expand Down Expand Up @@ -613,6 +616,7 @@ def configure_node(o):
target_arch = 'ia32'
o['variables']['host_arch'] = host_arch
o['variables']['target_arch'] = target_arch
o['variables']['node_byteorder'] = sys.byteorder

cross_compiling = target_arch != host_arch
want_snapshots = not options.without_snapshot
Expand Down
1 change: 1 addition & 0 deletions deps/npm/node_modules/node-gyp/addon.gypi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion deps/npm/node_modules/node-gyp/lib/configure.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 26 additions & 3 deletions deps/npm/node_modules/node-gyp/lib/install.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion deps/openssl/config/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ COPT = no-shared no-symlinks

ARCHS = BSD-x86 BSD-x86_64 VC-WIN32 VC-WIN64A darwin64-x86_64-cc \
darwin-i386-cc linux-aarch64 linux-armv4 linux-elf linux-x32 \
linux-x86_64 solaris-x86-gcc solaris64-x86_64-gcc
linux-x86_64 linux-ppc linux-ppc64 solaris-x86-gcc \
solaris64-x86_64-gcc

CFG = opensslconf.h
SRC_CFG = ../openssl/crypto/$(CFG)
Expand Down
258 changes: 258 additions & 0 deletions deps/openssl/config/archs/linux-ppc/opensslconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
/* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */

#ifdef __cplusplus
extern "C" {
#endif
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND


#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
# define OPENSSL_NO_EC_NISTP_64_GCC_128
#endif
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
#ifndef OPENSSL_NO_JPAKE
# define OPENSSL_NO_JPAKE
#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_LIBUNBOUND
# define OPENSSL_NO_LIBUNBOUND
#endif
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_SSL_TRACE
# define OPENSSL_NO_SSL_TRACE
#endif
#ifndef OPENSSL_NO_STORE
# define OPENSSL_NO_STORE
#endif
#ifndef OPENSSL_NO_UNIT_TEST
# define OPENSSL_NO_UNIT_TEST
#endif

#endif /* OPENSSL_DOING_MAKEDEPEND */

#ifndef OPENSSL_THREADS
# define OPENSSL_THREADS
#endif
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
# define OPENSSL_NO_DYNAMIC_ENGINE
#endif

/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
# define NO_EC_NISTP_64_GCC_128
# endif
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
# define NO_JPAKE
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
# define NO_LIBUNBOUND
# endif
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
# define NO_MD2
# endif
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
# define NO_RC5
# endif
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779
# endif
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
# define NO_SCTP
# endif
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
# define NO_SSL_TRACE
# endif
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
# define NO_STORE
# endif
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
# define NO_UNIT_TEST
# endif
#endif



/* crypto/opensslconf.h.in */

/* Generate 80386 code? */
#undef I386_ONLY

#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/usr/local/ssl/lib/engines"
#define OPENSSLDIR "/usr/local/ssl"
#endif
#endif

#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>

#undef OPENSSL_EXPORT_VAR_AS_FUNCTION

#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif

#if defined(HEADER_MD2_H) && !defined(MD2_INT)
#define MD2_INT unsigned int
#endif

#if defined(HEADER_RC2_H) && !defined(RC2_INT)
/* I need to put in a mod for the alpha - eay */
#define RC2_INT unsigned int
#endif

#if defined(HEADER_RC4_H)
#if !defined(RC4_INT)
/* using int types make the structure larger but make the code faster
* on most boxes I have tested - up to %20 faster. */
/*
* I don't know what does "most" mean, but declaring "int" is a must on:
* - Intel P6 because partial register stalls are very expensive;
* - elder Alpha because it lacks byte load/store instructions;
*/
#define RC4_INT unsigned char
#endif
#if !defined(RC4_CHUNK)
/*
* This enables code handling data aligned at natural CPU word
* boundary. See crypto/rc4/rc4_enc.c for further details.
*/
#define RC4_CHUNK unsigned long
#endif
#endif

#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
#define DES_LONG unsigned long
#endif
#endif

#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#define BN_LLONG

/* Should we define BN_DIV2W here? */

/* Only one for the following should be defined */
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
#endif

#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
#undef RC4_INDEX
#endif

#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
#define CONFIG_HEADER_BF_LOCL_H
#undef BF_PTR
#endif /* HEADER_BF_LOCL_H */

#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
#define CONFIG_HEADER_DES_LOCL_H
#ifndef DES_DEFAULT_OPTIONS
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
#undef DES_PTR
#endif

/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
#define DES_RISC1
#endif

#ifndef DES_RISC2
#undef DES_RISC2
#endif

#if defined(DES_RISC1) && defined(DES_RISC2)
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif

/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
#define DES_UNROLL
#endif

/* These default values were supplied by
* Peter Gutman <[email protected]>
* They are only used if nothing else has been defined */
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
/* Special defines which change the way the code is built depending on the
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
even newer MIPS CPU's, but at the moment one size fits all for
optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */

#if defined( sun ) /* Newer Sparc's */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#elif defined( __ultrix ) /* Older MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined( __osf1__ ) /* Alpha */
# define DES_PTR
# define DES_RISC2
#elif defined ( _AIX ) /* RS6000 */
/* Unknown */
#elif defined( __hpux ) /* HP-PA */
/* Unknown */
#elif defined( __aux ) /* 68K */
/* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
# define DES_UNROLL
#elif defined( __sgi ) /* Newer MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#endif /* Systems-specific speed defines */
#endif

#endif /* DES_DEFAULT_OPTIONS */
#endif /* HEADER_DES_LOCL_H */
#ifdef __cplusplus
}
#endif
Loading