fixed danialfarid#122

jonjaques · Feb 3, 2014 · a365a79 · a365a79
1 parent 57e66c3
commit a365a79
Show file tree

Hide file tree

Showing 14 changed files with 2,370 additions and 983 deletions.
diff --git a/demo/src/com/df/angularfileupload/FileUpload.java b/demo/src/com/df/angularfileupload/FileUpload.java
@@ -5,6 +5,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
+import java.util.Enumeration;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -46,7 +47,19 @@ protected void service(HttpServletRequest req, HttpServletResponse res) throws S
 						sb.append(",");
 					}
 				}
-				sb.append("]}");
+				sb.append("]");
+				sb.append(", \"requestHeaders\": {");
+				@SuppressWarnings("unchecked")
+				Enumeration<String> headerNames = req.getHeaderNames();
+				while (headerNames.hasMoreElements()) {
+					String header = headerNames.nextElement();
+					sb.append("\"").append(header).append("\":\"").append(req.getHeader(header)).append("\"");
+					if (headerNames.hasMoreElements()) {
+						sb.append(",");
+					}
+				}
+				sb.append("}}");
+
 				res.setContentType("application/json");
 				PrintWriter printWriter = new PrintWriter(res.getOutputStream());
 				try {

diff --git a/demo/war/common.css b/demo/war/common.css
@@ -26,7 +26,7 @@ input[multiple] {
 	list-style-type: decimal;
 }
 
-.response li {
+.response li, .response .reqh {
 	color: blue;
 	font-size: smaller;
 	padding-bottom: 5px; 

diff --git a/demo/war/index.html b/demo/war/index.html
@@ -66,13 +66,14 @@ <h3>
 			<ul>
 				<li ng-repeat="result in uploadResult">
 					<ul>
-						<li ng-repeat="item in result">
+						<li ng-repeat="item in result.result">
 							<div data-ng-show="item.name">file name: {{item.name}}</div>
 							<div data-ng-show="item.fieldName">name: {{item.fieldName}}</div>
 							<div data-ng-show="item.size">size on the serve: {{item.size}}</div>
 							<div data-ng-show="item.value">value: {{item.value}}</div>
 						</li>
 					</ul>
+					<div data-ng-show="result.requestHeaders" class="reqh">request headers: {{result.requestHeaders}}</div>
 				</li>
 			</ul>
 		</div>