bump to httpclient / httpcore 4.2.3 (bugfix-release)

yacy · Jan 17, 2013 · f3e705c · f3e705c
1 parent af465cd
commit f3e705c
Show file tree

Hide file tree

Showing 13 changed files with 254 additions and 202 deletions.
diff --git a/.classpath b/.classpath
@@ -34,9 +34,9 @@
 	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry kind="lib" path="lib/geronimo-stax-api_1.0_spec-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/wstx-asl-3.2.7.jar"/>
-	<classpathentry kind="lib" path="lib/httpcore-4.2.2.jar" sourcepath="/Volumes/Raptor/Data/sourcecode/httpcore/src/main/java"/>
-	<classpathentry kind="lib" path="lib/httpclient-4.2.2.jar" sourcepath="/Volumes/Raptor/Data/sourcecode/httpclient/src/main/java"/>
-	<classpathentry kind="lib" path="lib/httpmime-4.2.2.jar"/>
+	<classpathentry kind="lib" path="lib/httpcore-4.2.3.jar" sourcepath="/Volumes/Raptor/Data/sourcecode/httpcore/src/main/java"/>
+	<classpathentry kind="lib" path="lib/httpclient-4.2.3.jar" sourcepath="/Volumes/Raptor/Data/sourcecode/httpclient/src/main/java"/>
+	<classpathentry kind="lib" path="lib/httpmime-4.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/commons-io-2.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-compress-1.4.1.jar"/>
 	<classpathentry kind="lib" path="lib/guava-r05.jar"/>

diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist
@@ -57,9 +57,9 @@
 			<string>$JAVAROOT/lib/geronimo-stax-api_1.0_spec-1.0.1.jar</string>
 			<string>$JAVAROOT/lib/guava-r05.jar</string>
 			<string>$JAVAROOT/lib/htmllexer.jar</string>
-			<string>$JAVAROOT/lib/httpclient-4.2.2.jar</string>
-			<string>$JAVAROOT/lib/httpcore-4.2.2.jar</string>
-			<string>$JAVAROOT/lib/httpmime-4.2.2.jar</string>
+			<string>$JAVAROOT/lib/httpclient-4.2.3.jar</string>
+			<string>$JAVAROOT/lib/httpcore-4.2.3.jar</string>
+			<string>$JAVAROOT/lib/httpmime-4.2.3.jar</string>
 			<string>$JAVAROOT/lib/icu4j-core.jar</string>
 			<string>$JAVAROOT/lib/iri-0.8.jar</string>
 			<string>$JAVAROOT/lib/jakarta-oro-2.0.8.jar</string>

diff --git a/build.xml b/build.xml
@@ -176,9 +176,9 @@
         <pathelement location="${lib}/geronimo-stax-api_1.0_spec-1.0.1.jar" />
         <pathelement location="${lib}/guava-r05.jar" />
         <pathelement location="${lib}/htmllexer.jar" />
-        <pathelement location="${lib}/httpclient-4.2.2.jar" />
-        <pathelement location="${lib}/httpcore-4.2.2.jar" />
-        <pathelement location="${lib}/httpmime-4.2.2.jar" />
+        <pathelement location="${lib}/httpclient-4.2.3.jar" />
+        <pathelement location="${lib}/httpcore-4.2.3.jar" />
+        <pathelement location="${lib}/httpmime-4.2.3.jar" />
         <pathelement location="${lib}/icu4j-core.jar" />
         <pathelement location="${lib}/iri-0.8.jar" />
         <pathelement location="${lib}/jakarta-oro-2.0.8.jar" />

diff --git a/lib/dependencies.txt b/lib/dependencies.txt
@@ -22,8 +22,8 @@ commons-io-2.1.jar
 commons-lang-2.6.jar
 geronimo-stax-api_1.0_spec-1.0.1.jar
 guava-r05.jar
-httpclient-4.2.2.jar
-httpcore-4.2.2.jar
+httpclient-4.2.3.jar
+httpcore-4.2.3.jar
 jcl-over-slf4j-1.6.1.jar
 log4j-over-slf4j-1.6.1.jar
 lucene-analyzers-3.6.0.jar

diff --git a/lib/httpcore-4.2.2.License → lib/httpclient-4.2.3.License b/lib/httpcore-4.2.2.License → lib/httpclient-4.2.3.License
@@ -173,4 +173,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS
diff --git a/lib/httpclient-4.2.2.jar → lib/httpclient-4.2.3.jar b/lib/httpclient-4.2.2.jar → lib/httpclient-4.2.3.jar
diff --git a/lib/httpcore-4.2.3.License b/lib/httpcore-4.2.3.License
diff --git a/lib/httpcore-4.2.2.jar → lib/httpcore-4.2.3.jar b/lib/httpcore-4.2.2.jar → lib/httpcore-4.2.3.jar
diff --git a/lib/httpmime-4.2.2.License b/lib/httpmime-4.2.2.License
diff --git a/lib/httpclient-4.2.2.License → lib/httpmime-4.2.3.License b/lib/httpclient-4.2.2.License → lib/httpmime-4.2.3.License
@@ -174,9 +174,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls.
-See http://www.jcip.net and the Creative Commons Attribution License 
-(http://creativecommons.org/licenses/by/2.5)
-
diff --git a/lib/httpmime-4.2.2.jar → lib/httpmime-4.2.3.jar b/lib/httpmime-4.2.2.jar → lib/httpmime-4.2.3.jar
diff --git a/nbproject/project.xml b/nbproject/project.xml
@@ -77,7 +77,7 @@
             <compilation-unit>
                 <package-root>source</package-root>
                 <package-root>htroot</package-root>
-                <classpath mode="compile">lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/apache-solr-core-4.0.0.jar;lib/apache-solr-solrj-4.0.0.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-httpclient-3.1.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.1.jar;lib/fontbox-1.7.0.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-r05.jar;lib/htmllexer.jar;lib/htmlparser.jar;lib/httpclient-4.2.2.jar;lib/httpcore-4.2.2.jar;lib/httpmime-4.2.2.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/J7Zip-modified.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.15.jar;lib/jcl-over-slf4j-1.6.1.jar;lib/jempbox-1.7.0.jar;lib/jena-2.6.4.jar;lib/jetty-6.1.26-patched-JETTY-1340.jar;lib/jetty-util-6.1.26-patched-JETTY-1340.jar;lib/jsch-0.1.42.jar;lib/json-simple-1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-1.2.16.jar;lib/log4j-over-slf4j-1.6.1.jar;lib/lucene-analyzers-4.0.0.jar;lib/lucene-core-4.0.0.jar;lib/lucene-highlighter-4.0.0.jar;lib/lucene-phonetic-4.0.0.jar;lib/lucene-spatial-4.0.0.jar;lib/lucene-spellchecker-4.0.0.jar;lib/metadata-extractor-2.4.0-beta-1.jar;lib/mysql-connector-java-5.1.12-bin.jar;lib/pdfbox-1.7.0.jar;lib/poi-3.6-20091214.jar;lib/poi-scratchpad-3.6-20091214.jar;lib/sax-2.0.1.jar;lib/servlet-api-2.5-20081211.jar;lib/slf4j-api-1.6.1.jar;lib/slf4j-jdk14-1.6.1.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.7.jar;lib/xercesImpl.jar;lib/xml-apis.jar</classpath>
+                <classpath mode="compile">lib/activation.jar;lib/apache-mime4j-0.6.jar;lib/apache-solr-core-4.0.0.jar;lib/apache-solr-solrj-4.0.0.jar;lib/arq-2.8.7.jar;lib/bcmail-jdk15-145.jar;lib/bcprov-jdk15-145.jar;lib/commons-codec-1.7.jar;lib/commons-compress-1.4.1.jar;lib/commons-fileupload-1.2.2.jar;lib/commons-httpclient-3.1.jar;lib/commons-io-2.1.jar;lib/commons-jxpath-1.3.jar;lib/commons-lang-2.6.jar;lib/commons-logging-1.1.1.jar;lib/fontbox-1.7.0.jar;lib/geronimo-stax-api_1.0_spec-1.0.1.jar;lib/guava-r05.jar;lib/htmllexer.jar;lib/htmlparser.jar;lib/httpclient-4.2.3.jar;lib/httpcore-4.2.3.jar;lib/httpmime-4.2.3.jar;lib/icu4j-core.jar;lib/iri-0.8.jar;lib/J7Zip-modified.jar;lib/jakarta-oro-2.0.8.jar;lib/jaudiotagger-2.0.4-20111207.115108-15.jar;lib/jcifs-1.3.15.jar;lib/jcl-over-slf4j-1.6.1.jar;lib/jempbox-1.7.0.jar;lib/jena-2.6.4.jar;lib/jetty-6.1.26-patched-JETTY-1340.jar;lib/jetty-util-6.1.26-patched-JETTY-1340.jar;lib/jsch-0.1.42.jar;lib/json-simple-1.1.jar;lib/jsoup-1.6.3.jar;lib/log4j-1.2.16.jar;lib/log4j-over-slf4j-1.6.1.jar;lib/lucene-analyzers-4.0.0.jar;lib/lucene-core-4.0.0.jar;lib/lucene-highlighter-4.0.0.jar;lib/lucene-phonetic-4.0.0.jar;lib/lucene-spatial-4.0.0.jar;lib/lucene-spellchecker-4.0.0.jar;lib/metadata-extractor-2.4.0-beta-1.jar;lib/mysql-connector-java-5.1.12-bin.jar;lib/pdfbox-1.7.0.jar;lib/poi-3.6-20091214.jar;lib/poi-scratchpad-3.6-20091214.jar;lib/sax-2.0.1.jar;lib/servlet-api-2.5-20081211.jar;lib/slf4j-api-1.6.1.jar;lib/slf4j-jdk14-1.6.1.jar;lib/webcat-0.1-swf.jar;lib/wstx-asl-3.2.7.jar;lib/xercesImpl.jar;lib/xml-apis.jar</classpath>
                 <source-level>1.6</source-level>
             </compilation-unit>
         </java-data>

diff --git a/source/net/yacy/cora/protocol/http/HTTPClient.java b/source/net/yacy/cora/protocol/http/HTTPClient.java
@@ -670,7 +670,7 @@ private void storeConnectionInfo(final HttpUriRequest httpUriRequest) {
     	//assert thost != null : "uri = " + httpUriRequest.getURI().toString();
     	ConnectionInfo.addConnection(new ConnectionInfo(
     			httpUriRequest.getURI().getScheme(),
-    			port == 80 ? thost : thost + ":" + port,
+    			port == -1 ? thost : thost + ":" + port,
     			httpUriRequest.getMethod() + " " + httpUriRequest.getURI().getPath(),
     			httpUriRequest.hashCode(),
     			System.currentTimeMillis(),