Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@

* HTTPS server

* Built in debugger 'node debug script.js'
* Built in debugger 'node debug script.js'

* realpath files during module load (Mihai Călin Bazon)

Expand Down Expand Up @@ -293,7 +293,7 @@

* fs bugfixes (Tj Holowaychuk, Tobie Langel, Marco Rogers, isaacs)

* http bug fixes (Fedor Indutny, Mikeal Rogers)
* http bug fixes (Fedor Indutny, Mikeal Rogers)

* Faster buffers; breaks C++ API (Tim-Smart, Stéphan Kochen)

Expand Down Expand Up @@ -462,7 +462,7 @@
* Upgrade http-parser, V8 to 2.2.21


2010.06.21, Version 0.1.99, a620b7298f68f68a855306437a3b60b650d61d78
2010.06.21, Version 0.1.99, a620b7298f68f68a855306437a3b60b650d61d78

* Datagram sockets (Paul Querna)

Expand Down Expand Up @@ -568,7 +568,7 @@

2010.05.06, Version 0.1.94, f711d5343b29d1e72e87107315708e40951a7826

* Look in /usr/local/lib/node for modules, so that there's a way
* Look in /usr/local/lib/node for modules, so that there's a way
to install modules globally (Issac Schlueter)

* SSL improvements (Rhys Jones, Paulo Matias)
Expand All @@ -588,7 +588,7 @@
* Bugfix: destroy() instead of end() http connection at end of
pipeline

* Bugfix: http.Client may be prematurely released back to the
* Bugfix: http.Client may be prematurely released back to the
free pool. (Thomas Lee)

* Upgrade V8 to 2.2.8
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ are:
- v8, located under deps/v8, which is copyrighted by the Google, Inc.
v8 has a BSD license.

- libev, located under deps/libev, and libeio, located at deps/libeio.
- libev, located under deps/libev, and libeio, located at deps/libeio.
This code is copyrighted by Marc Alexander Lehmann. Both are dually
licensed under MIT and GPL2.

Expand Down Expand Up @@ -60,4 +60,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion README.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ To run the tests:
To build the documentation:

make -f Makefile.cmake doc

To read the documentation:

man doc/node.1
Expand Down
4 changes: 2 additions & 2 deletions benchmark/function_call/bench.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var binding = require('./build/default/binding');

c = 0
c = 0

function js() {
return c++; //(new Date()).getTime();
Expand Down Expand Up @@ -38,6 +38,6 @@ console.log("\nJS function call speed: %d microseconds", toMicro(jsDiff));
console.log("C++ function call speed: %d microseconds", toMicro(cxxDiff));


console.log("\nJS speedup " + (cxxDiff / jsDiff));
console.log("\nJS speedup " + (cxxDiff / jsDiff));


8 changes: 4 additions & 4 deletions benchmark/http_simple_bench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SERVER=127.0.0.1
PORT=8000

# You may want to configure your TCP settings to make many ports available
# to node and ab. On macintosh use:
# to node and ab. On macintosh use:
# sudo sysctl -w net.inet.ip.portrange.first=32768
# sudo sysctl -w net.inet.tcp.msl=1000

Expand All @@ -27,7 +27,7 @@ date=`date "+%Y%m%d%H%M%S"`
ab_hello_world() {
local type="$1"
local ressize="$2"
if [ $type == "string" ]; then
if [ $type == "string" ]; then
local uri="bytes/$ressize"
else
local uri="buffer/$ressize"
Expand Down Expand Up @@ -57,7 +57,7 @@ ab_hello_world() {
echo "webserver-rev: $rev" >> $summary_fn
echo "webserver-uname: $uname" >> $summary_fn

grep Req $summary_fn
grep Req $summary_fn

echo "Summary: $summary_fn"
echo
Expand All @@ -67,7 +67,7 @@ ab_hello_world() {
ab_hello_world 'string' '1024'
ab_hello_world 'buffer' '1024'

# 100k
# 100k
ab_hello_world 'string' '102400'
ab_hello_world 'buffer' '102400'

Expand Down
2 changes: 1 addition & 1 deletion benchmark/idle_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var errors = 0;
server = net.Server(function (socket) {

socket.on('error', function () {
errors++;
errors++;
});

});
Expand Down
2 changes: 1 addition & 1 deletion benchmark/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>

int tsize = 1000 * 1048576;
const char *path = "/tmp/wt.dat";

Expand Down
2 changes: 1 addition & 1 deletion benchmark/io.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function readtest(size, bsize) {
var s = fs.createReadStream(path, {'flags': 'r', 'encoding': 'binary', 'mode': 0644, 'bufferSize': bsize});
s.addListener("data", function (chunk) {
// got a chunk...

});
return s;
}
Expand Down
10 changes: 5 additions & 5 deletions benchmark/plot.R
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/usr/bin/env Rscript

# To use this script you'll need to install R: http://www.r-project.org/
# and a library for R called ggplot2
# and a library for R called ggplot2
# Which can be done by starting R and typing install.packages("ggplot2")
# like this:
#
# shell% R
# R version 2.11.0 beta (2010-04-12 r51689)
# > install.packages("ggplot2")
# (follow prompt)
# (follow prompt)
#
# Then you can try this script by providing a full path to .data file
# outputed from 'make bench'
Expand All @@ -17,7 +17,7 @@
# > make bench
# ...
# > ./benchmark/plot.R .benchmark_reports/ab-hello-world-buffer-1024/ff456b38862de3fd0118c6ac6b3f46edb1fbb87f/20101013162056.data
#
#
# This will generate a PNG file which you can view
#
#
Expand All @@ -39,14 +39,14 @@ ab.load <- function (filename, name) {
#ab.tsPoint <- function (d) {
# qplot(time_s, ttime, data=d, facets=server~.,
# geom="point", alpha=I(1/15), ylab="response time (ms)",
# xlab="time (s)", main="c=30, res=26kb",
# xlab="time (s)", main="c=30, res=26kb",
# ylim=c(0,100))
#}
#
#ab.tsLine <- function (d) {
# qplot(time_s, ttime, data=d, facets=server~.,
# geom="line", ylab="response time (ms)",
# xlab="time (s)", main="c=30, res=26kb",
# xlab="time (s)", main="c=30, res=26kb",
# ylim=c(0,100))
#}

Expand Down
2 changes: 1 addition & 1 deletion cmake/node_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ if(DTRACE)
endif()

install(TARGETS node RUNTIME DESTINATION bin)
install(FILES
install(FILES
${PROJECT_BINARY_DIR}/config.h
src/node.h
src/node_object_wrap.h
Expand Down
14 changes: 7 additions & 7 deletions cmake/v8_build.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ if(NOT SHARED_V8)
if(V8_GDBJIT)
set(v8_gdbjit gdbjit=on)
endif()

if(${node_platform} MATCHES darwin)
execute_process(COMMAND hwprefs cpu_count OUTPUT_VARIABLE cpu_count)
elseif(${node_platform} MATCHES linux)
Expand Down Expand Up @@ -54,28 +54,28 @@ if(NOT SHARED_V8)
if(CMAKE_VERSION VERSION_GREATER 2.8 OR CMAKE_VERSION VERSION_EQUAL 2.8)
# use ExternalProject for CMake >2.8
include(ExternalProject)

ExternalProject_Add(v8_extprj
URL ${PROJECT_SOURCE_DIR}/deps/v8

BUILD_IN_SOURCE True
BUILD_COMMAND sh -c "${compile_cmd}"
SOURCE_DIR ${PROJECT_BINARY_DIR}/deps/v8
# ignore this stuff, it's not needed for building v8 but ExternalProject
# demands these steps

CONFIGURE_COMMAND "true" # fake configure
INSTALL_COMMAND "true" # fake install
)

add_dependencies(node v8_extprj)
else()
# copy v8 sources inefficiently with CMake versions <2.8
file(GLOB_RECURSE v8_sources RELATIVE ${PROJECT_SOURCE_DIR} deps/v8/*)

if(NOT ${in_source_build})
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/deps/v8)

foreach(FILE ${v8_sources})
add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/${FILE}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/${FILE} ${PROJECT_BINARY_DIR}/${FILE}
Expand Down
4 changes: 2 additions & 2 deletions deps/c-ares/README.msvc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


___ __ _ _ __ ___ ___
___ __ _ _ __ ___ ___
/ __| ___ / _` | '__/ _ \/ __|
| (_ |___| (_| | | | __/\__ \
\___| \__,_|_| \___||___/
Expand Down Expand Up @@ -115,4 +115,4 @@


Have Fun!

2 changes: 1 addition & 1 deletion deps/c-ares/ares_destroy.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void ares_destroy(ares_channel channel)
struct query *query;
struct list_node* list_head;
struct list_node* list_node;

if (!channel)
return;

Expand Down
2 changes: 1 addition & 1 deletion deps/c-ares/ares_parse_ptr_reply.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ int ares_parse_ptr_reply(const unsigned char *abuf, int alen, const void *addr,
status = ARES_ENOMEM;
}
for (i=0 ; i<aliascnt ; i++)
if (aliases[i])
if (aliases[i])
free(aliases[i]);
free(aliases);
if (hostname)
Expand Down
2 changes: 1 addition & 1 deletion deps/http_parser/LICENSE-MIT
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
IN THE SOFTWARE.
2 changes: 1 addition & 1 deletion deps/libeio/aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -7919,7 +7919,7 @@ _LT_DECL(, macro_revision, 0)
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
Expand Down
4 changes: 2 additions & 2 deletions deps/libeio/eio.3
Original file line number Diff line number Diff line change
Expand Up @@ -2248,7 +2248,7 @@ used).
\& struct ev_loop *loop_hi = ev_default_init (0);
\& struct ev_loop *loop_lo = 0;
\& struct ev_embed embed;
\&
\&
\& // see if there is a chance of getting one that works
\& // (remember that a flags value of 0 means autodetection)
\& loop_lo = ev_embeddable_backends () & ev_recommended_backends ()
Expand All @@ -2274,7 +2274,7 @@ kqueue implementation). Store the kqueue/socket\-only event loop in
\& struct ev_loop *loop = ev_default_init (0);
\& struct ev_loop *loop_socket = 0;
\& struct ev_embed embed;
\&
\&
\& if (ev_supported_backends () & ~ev_recommended_backends () & EVBACKEND_KQUEUE)
\& if ((loop_socket = ev_loop_new (EVBACKEND_KQUEUE))
\& {
Expand Down
Loading