bugfix for issue alibaba#29

ottomao · ottomao · commit 13b0db906a6e · 2015-07-31T14:00:34.000+08:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+31 July: AnyProxy 3.7.2:
+
+    * bugfix for issue #29
+
 28 July: AnyProxy 3.7.1:
 
     * fix a bug about deflate compression
diff --git a/lib/webInterface.js b/lib/webInterface.js
@@ -98,7 +98,7 @@ function webInterface(config){
                 ipAddress   : ipAddress || "127.0.0.1"
             };
 
-        if(req.url == "/"){
+        if( url.parse(req.url).pathname == "/"){
             res.setHeader("Content-Type", "text/html");
             res.end(juicer(indexTpl, opt));
         }else{
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "anyproxy",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.",
   "main": "proxy.js",
   "bin": {
diff --git a/web/build/filter.js b/web/build/filter.js
@@ -22,7 +22,7 @@ function init(React){
 				React.createElement("div", null, 
 					React.createElement("h4", {className: "subTitle"}, "Log Filter"), 
 					React.createElement("div", {className: "filterSection"}, 
-						React.createElement("form", {className: "uk-form"}, 
+						React.createElement("div", {className: "uk-form"}, 
 							React.createElement("input", {className: "uk-form-large", ref: "keywordInput", onChange: self.dealChange, type: "text", placeholder: "keywords or /^regExp$/", width: "300"})
 						)
 					), 
diff --git a/web/build/index.js b/web/build/index.js
@@ -40,8 +40,8 @@ function util_merge(left,right){
 			onOpen : function(){
 				eventCenter.dispatchEvent("wsOpen");
 			},
-			onGetUpdate : function(content){
-				eventCenter.dispatchEvent("wsGetUpdate",content);
+			onGetUpdate : function(record){
+				eventCenter.dispatchEvent("wsGetUpdate",record);
 			},
 			onError     : function(e){
 				eventCenter.dispatchEvent("wsEnd");
diff --git a/web/css/page.css b/web/css/page.css
@@ -287,7 +287,7 @@ body, html {
 	margin: 50px auto 0;
 }
 
-.filterSection form{
+.filterSection .uk-form{
 	text-align: center;
 }
 
@@ -305,7 +305,7 @@ body, html {
 	background-size: 100% 100%;
 }
 
-.mapWrapper form{
+.mapWrapper .form{
 	margin-top: 20px;
 }
 
diff --git a/web/page.js b/web/page.js
@@ -86,8 +86,8 @@
 				onOpen : function(){
 					eventCenter.dispatchEvent("wsOpen");
 				},
-				onGetUpdate : function(content){
-					eventCenter.dispatchEvent("wsGetUpdate",content);
+				onGetUpdate : function(record){
+					eventCenter.dispatchEvent("wsGetUpdate",record);
 				},
 				onError     : function(e){
 					eventCenter.dispatchEvent("wsEnd");
@@ -20402,7 +20402,7 @@
 					React.createElement("div", null, 
 						React.createElement("h4", {className: "subTitle"}, "Log Filter"), 
 						React.createElement("div", {className: "filterSection"}, 
-							React.createElement("form", {className: "uk-form"}, 
+							React.createElement("div", {className: "uk-form"}, 
 								React.createElement("input", {className: "uk-form-large", ref: "keywordInput", onChange: self.dealChange, type: "text", placeholder: "keywords or /^regExp$/", width: "300"})
 							)
 						), 
diff --git a/web/src/filter.js b/web/src/filter.js
@@ -22,9 +22,9 @@ function init(React){
 				<div>
 					<h4 className="subTitle">Log Filter</h4>
 					<div className="filterSection">
-						<form className="uk-form">
+						<div className="uk-form">
 							<input className="uk-form-large" ref="keywordInput" onChange={self.dealChange} type="text" placeholder="keywords or /^regExp$/" width="300"/>
-						</form>
+						</div>
 					</div>
 				    <p>
 					    <i className="uk-icon-magic"></i>&nbsp;&nbsp;type <strong>/id=\d{3}/</strong> will give you all the logs containing <strong>id=123</strong>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "anyproxy",`
`3`		`- "version": "3.7.1",`
	`3`	`+ "version": "3.7.2",`
`4`	`4`	`"description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.",`
`5`	`5`	`"main": "proxy.js",`
`6`	`6`	`"bin": {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ function init(React){`
`22`	`22`	`React.createElement("div", null,`
`23`	`23`	`React.createElement("h4", {className: "subTitle"}, "Log Filter"),`
`24`	`24`	`React.createElement("div", {className: "filterSection"},`
`25`		`- React.createElement("form", {className: "uk-form"},`
	`25`	`+ React.createElement("div", {className: "uk-form"},`
`26`	`26`	`React.createElement("input", {className: "uk-form-large", ref: "keywordInput", onChange: self.dealChange, type: "text", placeholder: "keywords or /^regExp$/", width: "300"})`
`27`	`27`	`)`
`28`	`28`	`),`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ body, html {`
`287`	`287`	`margin: 50px auto 0;`
`288`	`288`	`}`
`289`	`289`
`290`		`-.filterSection form{`
	`290`	`+.filterSection .uk-form{`
`291`	`291`	`text-align: center;`
`292`	`292`	`}`
`293`	`293`
`@@ -305,7 +305,7 @@ body, html {`
`305`	`305`	`background-size: 100% 100%;`
`306`	`306`	`}`
`307`	`307`
`308`		`-.mapWrapper form{`
	`308`	`+.mapWrapper .form{`
`309`	`309`	`margin-top: 20px;`
`310`	`310`	`}`
`311`	`311`