Fixed backport of req.protocol

Author: tj

lib/request.js

@@ -323,8 +323,8 @@ req.__defineGetter__('isXMLHttpRequest', isxhr);
 req.__defineGetter__('xhr', isxhr);
 
 /**
- * Return the protocol string "http" or "https",
- * when requested with TLS. When the "trust proxy"
+ * Return the protocol string "http" or "https"
+ * when requested with TLS. When the "trust proxy" 
  * setting is enabled the "X-Forwarded-Proto" header
  * field will be trusted. If you're running behind
  * a reverse proxy that supplies https for you this
@@ -334,11 +334,24 @@ req.__defineGetter__('xhr', isxhr);
  * @api public
  */
 
-req.__defineGetter__('protocol', function(trustProxy){
-  var trustProxy = this.app.settings['trust proxy'];
-  return this.secure
+req.__defineGetter__('protocol', function(){
+  var trustProxy = this.app.get('trust proxy');
+  return this.connection.encrypted
     ? 'https'
     : trustProxy
-      ? (this.header('X-Forwarded-Proto') || 'http')
+      ? (this.get('X-Forwarded-Proto') || 'http')
       : 'http';
 });
+
+/**
+ * Short-hand for:
+ *
+ *    req.protocol == 'https'
+ *
+ * @return {Boolean}
+ * @api public
+ */
+
+req.__defineGetter__('secure', function(){
+  return 'https' == this.protocol;
+});