http: remove CRLF variable

PR-URL: #40101
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>

Author: shfshanyue

lib/_http_common.js

@@ -268,7 +268,7 @@ module.exports = {
 _checkIsHttpToken: checkIsHttpToken,
 chunkExpression: /(?:^|\W)chunked(?:$|\W)/i,
 continueExpression: /(?:^|\W)100-continue(?:$|\W)/i,
-CRLF: '\r\n',
+CRLF: '\r\n',// TODO: Deprecate this.
  freeParser,
  methods,
  parsers,

lib/_http_outgoing.js

@@ -45,9 +45,11 @@ const Stream = require('stream');
 constinternalUtil=require('internal/util');
 const{ kOutHeaders, utcDate, kNeedDrain }=require('internal/http');
 const{ Buffer }=require('buffer');
-constcommon=require('_http_common');
-constcheckIsHttpToken=common._checkIsHttpToken;
-constcheckInvalidHeaderChar=common._checkInvalidHeaderChar;
+const{
+_checkIsHttpToken: checkIsHttpToken,
+_checkInvalidHeaderChar: checkInvalidHeaderChar,
+chunkExpression: RE_TE_CHUNKED,
+}=require('_http_common');
 const{
  defaultTriggerAsyncIdScope,
 symbols: { async_id_symbol }
@@ -78,14 +80,12 @@ let debug = require('internal/util/debuglog').debuglog('http', (fn) => {
 });
 
 constHIGH_WATER_MARK=getDefaultHighWaterMark();
-const{CRLF}=common;
 
 constkCorked=Symbol('corked');
 
 constnop=()=>{};
 
 constRE_CONN_CLOSE=/(?:^|\W)close(?:$|\W)/i;
-constRE_TE_CHUNKED=common.chunkExpression;
 
 // isCookieField performs a case-insensitive comparison of a provided string
 // against the word "cookie." As of V8 6.6 this is faster than handrolling or
@@ -417,7 +417,7 @@ function _storeHeader(firstLine, headers) {
 
 // Date header
 if(this.sendDate&&!state.date){
-header+='Date: '+utcDate()+CRLF;
+header+='Date: '+utcDate()+'\r\n';
 }
 
 // Force the connection to close when the response is a 204 No Content or
@@ -447,14 +447,14 @@ function _storeHeader(firstLine, headers) {
 constshouldSendKeepAlive=this.shouldKeepAlive&&
 (state.contLen||this.useChunkedEncodingByDefault||this.agent);
 if(shouldSendKeepAlive){
-header+='Connection: keep-alive'+CRLF;
+header+='Connection: keep-alive\r\n';
 if(this._keepAliveTimeout&&this._defaultKeepAlive){
 consttimeoutSeconds=MathFloor(this._keepAliveTimeout/1000);
-header+=`Keep-Alive: timeout=${timeoutSeconds}${CRLF}`;
+header+=`Keep-Alive: timeout=${timeoutSeconds}\r\n`;
 }
 }else{
 this._last=true;
-header+='Connection: close'+CRLF;
+header+='Connection: close\r\n';
 }
 }
 
@@ -467,9 +467,9 @@ function _storeHeader(firstLine, headers) {
 }elseif(!state.trailer&&
 !this._removedContLen&&
 typeofthis._contentLength==='number'){
-header+='Content-Length: '+this._contentLength+CRLF;
+header+='Content-Length: '+this._contentLength+'\r\n';
 }elseif(!this._removedTE){
-header+='Transfer-Encoding: chunked'+CRLF;
+header+='Transfer-Encoding: chunked\r\n';
 this.chunkedEncoding=true;
 }else{
 // We should only be able to get here if both Content-Length and
@@ -487,7 +487,7 @@ function _storeHeader(firstLine, headers) {
 thrownewERR_HTTP_TRAILER_INVALID();
 }
 
-this._header=header+CRLF;
+this._header=header+'\r\n';
 this._headerSent=false;
 
 // Wait until the first body chunk, or close(), is sent to flush,
@@ -514,7 +514,7 @@ function processHeader(self, state, key, value, validate) {
 functionstoreHeader(self,state,key,value,validate){
 if(validate)
 validateHeaderValue(key,value);
-state.header+=key+': '+value+CRLF;
+state.header+=key+': '+value+'\r\n';
 matchHeader(self,state,key,value);
 }
 
@@ -694,7 +694,7 @@ ObjectDefineProperty(OutgoingMessage.prototype, 'writableNeedDrain', {
 }
 });
 
-constcrlf_buf=Buffer.from(CRLF);
+constcrlf_buf=Buffer.from('\r\n');
 OutgoingMessage.prototype.write=functionwrite(chunk,encoding,callback){
 if(typeofencoding==='function'){
 callback=encoding;
@@ -818,7 +818,7 @@ OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {
 debug('Trailer "%s" contains invalid characters',field);
 thrownewERR_INVALID_CHAR('trailer content',field);
 }
-this._trailer+=field+': '+value+CRLF;
+this._trailer+=field+': '+value+'\r\n';
 }
 };
 

lib/_http_server.js

@@ -37,7 +37,6 @@ const assert = require('internal/assert');
 const{
  parsers,
  freeParser,
-CRLF,
  continueExpression,
  chunkExpression,
  kIncomingMessage,
@@ -254,12 +253,12 @@ ServerResponse.prototype.detachSocket = function detachSocket(socket) {
 };
 
 ServerResponse.prototype.writeContinue=functionwriteContinue(cb){
-this._writeRaw(`HTTP/1.1 100 Continue${CRLF}${CRLF}`,'ascii',cb);
+this._writeRaw('HTTP/1.1 100 Continue\r\n\r\n','ascii',cb);
 this._sent100=true;
 };
 
 ServerResponse.prototype.writeProcessing=functionwriteProcessing(cb){
-this._writeRaw(`HTTP/1.1 102 Processing${CRLF}${CRLF}`,'ascii',cb);
+this._writeRaw('HTTP/1.1 102 Processing\r\n\r\n','ascii',cb);
 };
 
 ServerResponse.prototype._implicitHeader=function_implicitHeader(){
@@ -322,7 +321,7 @@ function writeHead(statusCode, reason, obj) {
 if(checkInvalidHeaderChar(this.statusMessage))
 thrownewERR_INVALID_CHAR('statusMessage');
 
-conststatusLine=`HTTP/1.1 ${statusCode}${this.statusMessage}${CRLF}`;
+conststatusLine=`HTTP/1.1 ${statusCode}${this.statusMessage}\r\n`;
 
 if(statusCode===204||statusCode===304||
 (statusCode>=100&&statusCode<=199)){
@@ -648,16 +647,16 @@ function onParserTimeout(server, socket) {
 
 constnoop=()=>{};
 constbadRequestResponse=Buffer.from(
-`HTTP/1.1 400 ${STATUS_CODES[400]}${CRLF}`+
-`Connection: close${CRLF}${CRLF}`,'ascii'
+`HTTP/1.1 400 ${STATUS_CODES[400]}\r\n`+
+'Connection: close\r\n\r\n','ascii'
 );
 constrequestTimeoutResponse=Buffer.from(
-`HTTP/1.1 408 ${STATUS_CODES[408]}${CRLF}`+
-`Connection: close${CRLF}${CRLF}`,'ascii'
+`HTTP/1.1 408 ${STATUS_CODES[408]}\r\n`+
+'Connection: close\r\n\r\n','ascii'
 );
 constrequestHeaderFieldsTooLargeResponse=Buffer.from(
-`HTTP/1.1 431 ${STATUS_CODES[431]}${CRLF}`+
-`Connection: close${CRLF}${CRLF}`,'ascii'
+`HTTP/1.1 431 ${STATUS_CODES[431]}\r\n`+
+'Connection: close\r\n\r\n','ascii'
 );
 functionsocketOnError(e){
 // Ignore further errors