Use res.headersSent when available

expressjs · Sep 27, 2017 · ea47a7d · ea47a7d
1 parent 7348b5c
commit ea47a7d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,18 +1,14 @@
 unreleased
 ==========
 
+  * Use `res.headersSent` when available
   * deps: basic-auth@~2.0.0
      - Use `safe-buffer` for improved Buffer API
   * deps: debug@2.6.9
   * deps: depd@~1.1.1
     - Remove unnecessary `Buffer` loading
 
 1.8.2 / 2017-05-23
-==================
-
-  * deps: debug@2.6.8
-    - Fix `DEBUG_MAX_ARRAY_LENGTH`
-    - deps: ms@2.0.0
 
 1.8.1 / 2017-02-04
 ==================

diff --git a/index.js b/index.js
@@ -182,7 +182,7 @@ morgan.format('tiny', ':method :url :status :res[content-length] - :response-tim
 
 morgan.format('dev', function developmentFormatLine (tokens, req, res) {
   // get the status code if response written
-  var status = res._header
+  var status = headersSent(res)
     ? res.statusCode
     : undefined
 
@@ -261,7 +261,7 @@ morgan.token('date', function getDateToken (req, res, format) {
  */
 
 morgan.token('status', function getStatusToken (req, res) {
-  return res._header
+  return headersSent(res)
     ? String(res.statusCode)
     : undefined
 })
@@ -328,7 +328,7 @@ morgan.token('req', function getRequestToken (req, res, field) {
  */
 
 morgan.token('res', function getResponseHeader (req, res, field) {
-  if (!res._header) {
+  if (!headersSent(res)) {
     return undefined
   }
 
@@ -469,6 +469,20 @@ function getip (req) {
     undefined
 }
 
+/**
+ * Determine if the response headers have been sent.
+ *
+ * @param {object} res
+ * @returns {boolean}
+ * @private
+ */
+
+function headersSent (res) {
+  return typeof res.headersSent !== 'boolean'
+    ? Boolean(res._header)
+    : res.headersSent
+}
+
 /**
  * Pad number to two digits.
  *