sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update Apache httpcore and httpclient to 4.2.3

Browse Source
cusax-fix
Ingo Bauersachs 13 years ago
parent 9fdc198842
commit 04a0a71627
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

5
.classpath
Unescape View File

@ -31,9 +31,8 @@
<classpathentry kind="lib" path="lib/installer-exclude/gdata-core-1.0.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/gdata-core-1.0.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/google-collect-1.0-rc1.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/google-collect-1.0-rc1.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/hexdump-0.2.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/hexdump-0.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/httpclient-4.1.2.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/httpclient-osgi-4.2.3.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/httpcore-4.1.2.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/httpcore-osgi-4.2.3.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/httpmime-4.1.2.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/ice4j.jar"/> <classpathentry kind="lib" path="lib/installer-exclude/ice4j.jar"/>
<classpathentry kind="lib" path="lib/installer-exclude/jain-sdp.jar"> <classpathentry kind="lib" path="lib/installer-exclude/jain-sdp.jar">
<attributes> <attributes>

5
build.xml
Unescape View File

@ -1975,9 +1975,8 @@ javax.swing.event, javax.swing.border"/>
manifest="${src}/net/java/sip/communicator/service/httputil/httputil.manifest.mf"> manifest="${src}/net/java/sip/communicator/service/httputil/httputil.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/service/httputil" <zipfileset dir="${dest}/net/java/sip/communicator/service/httputil"
prefix="net/java/sip/communicator/service/httputil"/> prefix="net/java/sip/communicator/service/httputil"/>
<zipfileset src="${lib.noinst}/httpclient-4.1.2.jar" prefix=""/> <zipfileset src="${lib.noinst}/httpclient-osgi-4.2.3.jar" prefix=""/>
<zipfileset src="${lib.noinst}/httpcore-4.1.2.jar" prefix=""/> <zipfileset src="${lib.noinst}/httpcore-osgi-4.2.3.jar" prefix=""/>
<zipfileset src="${lib.noinst}/httpmime-4.1.2.jar" prefix=""/>
</jar> </jar>
</target> </target>

BIN
lib/installer-exclude/httpclient-4.1.2.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/httpclient-osgi-4.2.3.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/httpcore-4.1.2.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/httpcore-osgi-4.2.3.jar
View File

Binary file not shown.

BIN
lib/installer-exclude/httpmime-4.1.2.jar
View File

Binary file not shown.

2
nbproject/project.xml
Unescape View File

@ -116,7 +116,7 @@
<java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2"> <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
<compilation-unit> <compilation-unit>
<package-root>src</package-root> <package-root>src</package-root>
<classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/httpclient-4.1.2.jar:lib/installer-exclude/httpcore-4.1.2.jar:lib/installer-exclude/httpmime-4.1.2.jar:lib/installer-exclude/ice4j.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jml-1.0b5.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-simple-1.1.1.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/libjitsi.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/sdes4j.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/jna-platform.jar:lib/installer-exclude/unix-0.5.jar:lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar:lib/installer-exclude/ymsg_network_v0_67.jar:lib/installer-exclude/zrtp4j-light.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/windows/jdic_stub.jar</classpath> <classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/httpclient-osgi-4.2.3.jar:lib/installer-exclude/httpcore-osgi-4.2.3.jar:lib/installer-exclude/ice4j.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jml-1.0b5.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-simple-1.1.1.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/libjitsi.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/sdes4j.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/jna-platform.jar:lib/installer-exclude/unix-0.5.jar:lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar:lib/installer-exclude/ymsg_network_v0_67.jar:lib/installer-exclude/zrtp4j-light.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/windows/jdic_stub.jar</classpath>
<built-to>classes</built-to> <built-to>classes</built-to>
<source-level>1.5</source-level> <source-level>1.5</source-level>
</compilation-unit> </compilation-unit>

8
src/net/java/sip/communicator/service/httputil/HttpUtils.java
Unescape View File

@ -32,7 +32,6 @@
import org.apache.http.impl.conn.*; import org.apache.http.impl.conn.*;
import org.apache.http.message.*; import org.apache.http.message.*;
import org.apache.http.params.*; import org.apache.http.params.*;
import org.apache.http.protocol.*;
import org.apache.http.util.*; import org.apache.http.util.*;
import org.jitsi.util.*; import org.jitsi.util.*;
@ -494,8 +493,8 @@ else if(i == passwordParamIx && creds != null)
} }
} }
String s = URLEncodedUtils.format(parameters, HTTP.UTF_8); String s = URLEncodedUtils.format(parameters, Consts.UTF_8);
StringEntity entity = new StringEntity(s, HTTP.UTF_8); StringEntity entity = new StringEntity(s, Consts.UTF_8);
// set content type to "application/x-www-form-urlencoded" // set content type to "application/x-www-form-urlencoded"
entity.setContentType(URLEncodedUtils.CONTENT_TYPE); entity.setContentType(URLEncodedUtils.CONTENT_TYPE);
@ -554,6 +553,9 @@ private static DefaultHttpClient getHttpClient(
throw new IOException(e.getMessage()); throw new IOException(e.getMessage());
} }
// note to any reviewer concerned about ALLOW_ALL_HOSTNAME_VERIFIER:
// the SSL context obtained from the certificate service takes care of
// certificate validation
Scheme sch = Scheme sch =
new Scheme("https", 443, new SSLSocketFactory(sslCtx, new Scheme("https", 443, new SSLSocketFactory(sslCtx,
SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER)); SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER));

Write Preview
Loading…
Cancel
Save