Skip to content

Throw Error when url.parse without true is parsed #1282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 1, 2017
Merged

Throw Error when url.parse without true is parsed #1282

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
060b159
Throw Error when url.parse without true is parsed
timweprovide Feb 25, 2017
80bdfa2
Parse when needed
timweprovide Feb 26, 2017
a694294
Merge branch 'master' of git://github.com/zeit/next.js into improve-p…
timweprovide Feb 26, 2017
d771e82
Merge branch 'master' of git://github.com/zeit/next.js into improve-p…
timweprovide Feb 28, 2017
0202a40
Parse querystring if it is not provided
timweprovide Feb 28, 2017
256324e
Merge branch 'master' of git://github.com/zeit/next.js into improve-p…
timweprovide Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { resolve, join } from 'path'
import { parse } from 'url'
import { parse as parseUrl } from 'url'
import { parse as parseQs } from 'querystring'
import fs from 'mz/fs'
import http, { STATUS_CODES } from 'http'
import {
Expand Down Expand Up @@ -33,12 +34,14 @@ export default class Server {

getRequestHandler () {
return (req, res, parsedUrl) => {
// Parse url if parsedUrl not provided
if (!parsedUrl) {
parsedUrl = parse(req.url, true)
parsedUrl = parseUrl(req.url, true)
}

if (!parsedUrl.query) {
throw new Error('Please provide a parsed url to `handle` as third parameter. See https://github.com/zeit/next.js#custom-server-and-routing for an example.')
// Parse the querystring ourselves if the user doesn't handle querystring parsing
if (typeof parsedUrl.query === 'string') {
parsedUrl.query = parseQs(parsedUrl.query)
}

return this.run(req, res, parsedUrl)
Expand Down Expand Up @@ -222,7 +225,7 @@ export default class Server {
}
}

async render404 (req, res, parsedUrl = parse(req.url, true)) {
async render404 (req, res, parsedUrl = parseUrl(req.url, true)) {
const { pathname, query } = parsedUrl
res.statusCode = 404
return this.renderError(null, req, res, pathname, query)
Expand Down