Commit 7daba43a authored by Dustin Jenkins's avatar Dustin Jenkins
Browse files

Story 1874: Modify content type for PEM downloads.

parent 0ec09b65

cadcCDP-Server/build.xml

+2 −2
Original line number Diff line number Diff line
@@ -112,9 +112,9 @@ 
          tofile="${build}/test/class/proxy.pem"/>

  </target>



  <property name="easyMock" value="${ext.dev}/easymock.jar"/>

  <property name="easyMock" value="${ext.dev}/easymock-3.4.jar"/>

  <property name="junit" value="${ext.dev}/junit.jar"/>

  <property name="objenesis" value="${ext.dev}/objenesis.jar"/>

  <property name="objenesis" value="${ext.dev}/objenesis-2.2.jar"/>



  <property name="testingJars" value="${junit}:${objenesis}:${easyMock}"/>

cadcCDP-Server/src/ca/nrc/cadc/cred/server/ProxyServlet.java

+8 −2
Original line number Diff line number Diff line
@@ -112,8 +112,14 @@ public class ProxyServlet extends HttpServlet 
    public static final String CATALOG = "catalog";

    public static final String SCHEMA = "schema";



    static final String CERTIFICATE_CONTENT_TYPE =

            "application/x-x509-user-cert";

    // Story 1874

    // Content Type changed from application/x-x509-user-cert to

    // application/x-pem-file to accommodate browser downloads, and for

    // accuracy of the final file downloaded.

    //

    // jenkinsd 2016.01.15

    //

    static final String CERTIFICATE_CONTENT_TYPE = "application/x-pem-file";

    static final String CERTIFICATE_FILENAME = "cadcproxy.pem";

    

    private static final long serialVersionUID = 2740612605831266225L;