Skip to content

Commit e0001dc

Browse files
jasnelladdaleax
authored andcommitted
http: move utcDate to internal/http.js
Backport-PR-URL: #14813 Backport-Reviewed-By: Anna Henningsen <[email protected]> Backport-Reviewed-By: Timothy Gu <[email protected]> PR-URL: #14239 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
1 parent 9e51802 commit e0001dc

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

lib/_http_outgoing.js

100644100755
+2-17
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
const assert = require('assert').ok;
2525
const Stream = require('stream');
26-
const timers = require('timers');
2726
const util = require('util');
2827
const internalUtil = require('internal/util');
28+
const internalHttp = require('internal/http');
2929
const Buffer = require('buffer').Buffer;
3030
const common = require('_http_common');
3131
const checkIsHttpToken = common._checkIsHttpToken;
@@ -36,6 +36,7 @@ const nextTick = require('internal/process/next_tick').nextTick;
3636

3737
const CRLF = common.CRLF;
3838
const debug = common.debug;
39+
const utcDate = internalHttp.utcDate;
3940

4041
var RE_FIELDS =
4142
/^(?:Connection|Transfer-Encoding|Content-Length|Date|Expect|Trailer|Upgrade)$/i;
@@ -63,24 +64,8 @@ function isCookieField(s) {
6364
return true;
6465
}
6566

66-
var dateCache;
67-
function utcDate() {
68-
if (!dateCache) {
69-
var d = new Date();
70-
dateCache = d.toUTCString();
71-
timers.enroll(utcDate, 1000 - d.getMilliseconds());
72-
timers._unrefActive(utcDate);
73-
}
74-
return dateCache;
75-
}
76-
utcDate._onTimeout = function _onTimeout() {
77-
dateCache = undefined;
78-
};
79-
80-
8167
function noopPendingOutput(amount) {}
8268

83-
8469
function OutgoingMessage() {
8570
Stream.call(this);
8671

lib/internal/http.js

100644100755
+17
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
'use strict';
22

3+
const timers = require('timers');
4+
5+
var dateCache;
6+
function utcDate() {
7+
if (!dateCache) {
8+
const d = new Date();
9+
dateCache = d.toUTCString();
10+
timers.enroll(utcDate, 1000 - d.getMilliseconds());
11+
timers._unrefActive(utcDate);
12+
}
13+
return dateCache;
14+
}
15+
utcDate._onTimeout = function() {
16+
dateCache = undefined;
17+
};
18+
319
function ondrain() {
420
if (this._httpMessage) this._httpMessage.emit('drain');
521
}
622

723
module.exports = {
824
outHeadersKey: Symbol('outHeadersKey'),
925
ondrain,
26+
utcDate
1027
};

0 commit comments

Comments
 (0)