Merge conflicts resolved

2019-09-23 07:34:27 +02:00
parent 261f947777 3ec4592fb2
commit 35c1305ce9
13 changed files with 319 additions and 22 deletions
--- a/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/ContentTypeAssignment.java
+++ b/webgoat-lessons/xxe/src/main/java/org/owasp/webgoat/xxe/ContentTypeAssignment.java
@ -58,7 +58,7 @@ public class ContentTypeAssignment extends AssignmentEndpoint {
            attackResult = failed().feedback("xxe.content.type.feedback.json").build();
        }

-        if (MediaType.APPLICATION_XML_VALUE.equals(contentType)) {
+        if (null != contentType && contentType.contains(MediaType.APPLICATION_XML_VALUE)) {
            String error = "";
            try {
                Comment comment = comments.parseXml(commentStr);