Skip to content

Commit 4aa2801

Browse files
dougwilsondougwilson
committed
Merge tag '3.18.6'
2 parents 4d80933 + 4405b84 commit 4aa2801

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+255
-211
lines changed

‎History.md

+20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
unreleased
2+
==========
3+
4+
* Fix exception in `req.fresh`/`req.stale` without response headers
5+
16
4.10.5 / 2014-12-10
27
===================
38

@@ -608,6 +613,21 @@
608613
- `app.route()` - Proxy to the app's `Router#route()` method to create a new route
609614
- Router & Route - public API
610615

616+
3.18.6 / 2014-12-12
617+
===================
618+
619+
* Fix exception in `req.fresh`/`req.stale` without response headers
620+
621+
3.18.5 / 2014-12-11
622+
===================
623+
624+
* deps: [email protected]
625+
- deps: compression@~1.2.2
626+
- deps: express-session@~1.9.3
627+
- deps: http-errors@~1.2.8
628+
- deps: serve-index@~1.5.3
629+
- deps: type-is@~1.5.4
630+
611631
3.18.4 / 2014-11-23
612632
===================
613633

‎examples/error-pages/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var silent = 'test' == process.env.NODE_ENV;
99

1010
// general config
1111
app.set('views', __dirname + '/views');
12-
app.set('view engine', 'jade');
12+
app.set('view engine', 'ejs');
1313

1414
// our custom "verbose errors" setting
1515
// which we can use in the templates
@@ -25,7 +25,7 @@ silent || app.use(logger('dev'));
2525
// Routes
2626

2727
app.get('/', function(req, res){
28-
res.render('index.jade');
28+
res.render('index.ejs');
2929
});
3030

3131
app.get('/404', function(req, res, next){
@@ -96,7 +96,6 @@ app.use(function(err, req, res, next){
9696
res.render('500', { error: err });
9797
});
9898

99-
10099
/* istanbul ignore next */
101100
if (!module.parent) {
102101
app.listen(3000);

‎examples/error-pages/views/404.ejs

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<% include error_header %>
2+
<h2>Cannot find <%= url %></h2>
3+
<% include footer %>

‎examples/error-pages/views/404.jade

-5
This file was deleted.

‎examples/error-pages/views/500.ejs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<% include error_header %>
2+
<h2>Error: <%= error.message %></h2>
3+
<% if (settings['verbose errors']) { %>
4+
<pre><%= error.stack %></pre>
5+
<% } else { %>
6+
<p>An error occurred!</p>
7+
<% } %>
8+
<% include footer %>

‎examples/error-pages/views/500.jade

-13
This file was deleted.

‎examples/error-pages/views/error.jade

-6
This file was deleted.

‎examples/error-pages/views/error_header.ejs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>Error</title>
5+
</head>
6+
7+
<body>
8+
<h1>An error occurred!</h1>

‎examples/error-pages/views/footer.ejs

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
</body>
2+
</html>

‎examples/error-pages/views/index.ejs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>Custom Pages Example</title>
5+
</head>
6+
7+
<body>
8+
<h1>My Site</h1>
9+
<h2>Pages Example</h2>
10+
11+
<ul>
12+
<li>visit <a href="/500">500</a></li>
13+
<li>visit <a href="/404">404</a></li>
14+
<li>visit <a href="/403">403</a></li>
15+
</ul>
16+
17+
</body>
18+
</html>

‎examples/error-pages/views/index.jade

-15
This file was deleted.

‎examples/error-pages/views/layout.jade

-6
This file was deleted.

‎examples/mvc/controllers/pet/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
var db = require('../../db');
66

7+
exports.engine = 'ejs';
8+
79
exports.before = function(req, res, next){
810
var pet = db.pets[req.params.pet_id];
911
if (!pet) return next('route');

‎examples/mvc/controllers/pet/views/edit.ejs

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<link rel="stylesheet" href="/style.css">
5+
<title>Edit <%= pet.name %></title>
6+
</head>
7+
8+
<body>
9+
<h1><%= pet.name %></h1>
10+
<form action="/pet/<%= pet.id %>?_method=put" method="post">
11+
<label>Name: <input type="text" name="user[name]" value="<%= pet.name %>"></label>
12+
<input type="submit" value="Update">
13+
</form>
14+
</body>
15+
</html>

‎examples/mvc/controllers/pet/views/edit.jade

-6
This file was deleted.

‎examples/mvc/controllers/pet/views/show.ejs

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<link rel="stylesheet" href="/style.css">
5+
<title><%= pet.name %></title>
6+
</head>
7+
8+
<body>
9+
<h1><%= pet.name %> <a href="/pet/<%= pet.id %>/edit">edit</a></h1>
10+
11+
<p>You are viewing <%= pet.name %></p>
12+
</body>
13+
</html>

‎examples/mvc/controllers/pet/views/show.jade

-6
This file was deleted.

‎lib/request.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ defineGetter(req, 'fresh', function(){
412412

413413
// 2xx or 304 as per rfc2616 14.26
414414
if ((s >= 200 && s < 300) || 304 == s) {
415-
return fresh(this.headers, this.res._headers);
415+
return fresh(this.headers, (this.res._headers || {}));
416416
}
417417

418418
return false;

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
},
5555
"devDependencies": {
5656
"after": "0.8.1",
57-
"istanbul": "0.3.2",
57+
"istanbul": "0.3.5",
5858
"mocha": "~2.0.0",
59-
"should": "~4.3.0",
59+
"should": "~4.3.1",
6060
"supertest": "~0.15.0",
6161
"ejs": "~1.0.0",
6262
"marked": "0.3.2",

‎support/app.js

-65
This file was deleted.

‎support/views/hello.jade

-1
This file was deleted.

0 commit comments

Comments
 (0)