(cxf) branch 3.6.x-fixes updated: [CXF-9111]ensure we have correct Content-Disposition set per spec

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
     new c54b850322d [CXF-9111]ensure we have correct Content-Disposition set 
per spec
c54b850322d is described below

commit c54b850322d0187f21546193d6c3f35b0ecafef2
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Fri Jan 9 17:25:38 2026 -0500

    [CXF-9111]ensure we have correct Content-Disposition set per spec
    
    (cherry picked from commit 2968735a216540871780e081103e9bb892a1fbb5)
    (cherry picked from commit 30a0df29b42a1f608e54b2c36981181a1c9f60bb)
---
 .../src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index 62d96fdcf5b..4a0d74ebd1c 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -359,7 +359,8 @@ public class MultipartProvider extends 
AbstractConfigurableProvider
                                      att.getContentType().toString(), id);
             MediaType mediaType = httpHeaders.getMediaType();
             Attachment ret = null;
-            if (MediaType.MULTIPART_FORM_DATA_TYPE.isCompatible(mediaType)) {
+            if (MediaType.MULTIPART_FORM_DATA_TYPE.isCompatible(mediaType)
+                && att.getHeader("Content-Disposition") == null) {
                 ContentDisposition cd = new 
                     ContentDisposition("form-data;name=\"" 
                         + att.getContentId() + "\"");