Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Baiang/dfy
Browse files Browse the repository at this point in the history
  • Loading branch information
Baiang committed May 11, 2016
2 parents 695861a + ff8592e commit 9db7a30
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
dfy
==========================
# dfy

[![npm](https://img.shields.io/npm/v/npm.svg?maxAge=2592000)]() [![Github Releases](https://img.shields.io/github/downloads/atom/atom/latest/total.svg?maxAge=2592000)]()

Expand Down
7 changes: 7 additions & 0 deletions lib/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,16 @@ function server(port,domain) {
res.end(req.url);
return;
}
<<<<<<< HEAD
console.log((' [Scuess Code] '+ data.status + ' ' + http.STATUS_CODES[data.status]).yellow);
console.log((' [' + nowStr + ']').gray);
// res.sendStatus(data.status);
=======

console.log((' [Scuess Code] ' + data.status + ' OK').yellow);
console.log((' [' + nowStr + ']').gray);
res.writeHead(data.status, headers);
>>>>>>> ff8592e507457562a71b23d674d340f21f4edd5c
if (data.ok) {
if(typeof data.text == 'object'){
res.header('Content-Type', 'application/json;charset=utf-8');
Expand Down

0 comments on commit 9db7a30

Please sign in to comment.