Skip to content
This repository was archived by the owner on Dec 12, 2025. It is now read-only.

Commit da7608a

Browse files
committed
Add configuration to consider all requests chunked
1 parent 64870fd commit da7608a

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: node_js
22
- 0.10
3+
env:
4+
- SKIP_JAVA_VERSION_CHECK=true
35
install:
46
- npm install
57
before_script:

bin/calcdeps.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ deps.build = function(infos) {
349349
// Add each provided namespace from that file to the map.
350350
info.provides.forEach(function(ns) {
351351
if (ns in hash) {
352-
$.util.error($.util.format(
352+
console.error($.util.format(
353353
'Duplicate provide for "%s" in %s and %s.',
354354
ns, info.path, hash[ns].path));
355355
process.exit(1);
@@ -377,7 +377,7 @@ deps.build = function(infos) {
377377
deps.resolve = function(info, hash, ordered, seen) {
378378
info.requires.forEach(function(ns) {
379379
if (!(ns in hash)) {
380-
$.util.error($.util.format(
380+
console.error($.util.format(
381381
'Missing provide for "%s" required by %s.',
382382
ns, info.path));
383383
process.exit(1);
@@ -409,13 +409,13 @@ deps.order = function(hash, inputs) {
409409
if (tests.isNS(input)) {
410410
var ns = NAMESPACE_REGEX.exec(input)[1];
411411
if (!(ns in hash)) {
412-
$.util.error($.util.format('Missing input namespace "%s".', ns));
412+
console.error($.util.format('Missing input namespace "%s".', ns));
413413
process.exit(1);
414414
}
415415
info = hash[ns];
416416
} else {
417417
if (!(input in hash)) {
418-
$.util.error($.util.format('Missing input file "%s".', input));
418+
console.error($.util.format('Missing input file "%s".', input));
419419
process.exit(1);
420420
}
421421
info = hash[input];
@@ -532,7 +532,7 @@ function main(opts, args) {
532532
} else if (opts.mode == 'concat') {
533533
output = infos.map(function(info) { return info.content; }).join('\n');
534534
} else {
535-
$.util.error('Unknown output mode');
535+
console.error('Unknown output mode');
536536
process.exit(1);
537537
}
538538

bin/configure.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,15 @@ function requirements() {
7474
var required = $.semver('1.7.0');
7575
$.childProcess.exec('java -version', function(error, stdout, stderr) {
7676
if (error || !stderr) {
77-
$.util.error([
78-
'Unable to get java version.',
79-
'Please install java before building.',
80-
].join('\n'));
77+
console.error([
78+
'Unable to get java version.',
79+
'Please install java before building.',
80+
].join('\n'));
8181
process.exit(1);
8282
}
83+
if (process.env.SKIP_JAVA_VERSION_CHECK) {
84+
return;
85+
}
8386
var version;
8487
var installed;
8588
try {
@@ -88,10 +91,12 @@ function requirements() {
8891
installed = $.semver.parse(version.replace('_', '-'));
8992
} catch (ex) {}
9093
if (!installed || installed < required) {
91-
$.util.error($.util.format([
94+
console.error($.util.format(
95+
[
9296
'Installed java version "%s" is less than the required "%s".',
9397
'Please upgrade java before building.'
94-
].join('\n'), installed, required));
98+
].join('\n'),
99+
installed, required));
95100
process.exit(1);
96101
}
97102
});

src/client/net/xhr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ spf.net.xhr.isChunked_ = function(xhr) {
204204
if (xhr.responseType == 'json') {
205205
return false;
206206
}
207-
if (spf.config.get('assume-all-json-requests-chunked')){
207+
if (spf.config.get('assume-all-json-requests-chunked')) {
208208
return true;
209209
}
210210
// Determine whether to process chunks as they arrive.

0 commit comments

Comments
 (0)