
libjava/ChangeLog: 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * sources.am, Makfile.in: Regenerate. 2008-10-17 Matthias Klose <doko@ubuntu.com> * configure.ac: Fix bashisms. * configure: Regenerate. 2008-10-15 Matthias Klose <doko@ubuntu.com> * configure.ac: Disable build of gjdoc, if configured without --with-antlr-jar or if no antlr.jar found. * configure: Regenerate. 2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure.ac, * classpath/m4/ac_prog_antlr.m4, * classpath/m4/ac_prog_java.m4, * classpath/tools/Makefile.am: Ported --regen-gjdoc-parser patch and cantlr support from GNU Classpath. 2008-10-06 Andrew Haley <aph@redhat.com> * java/lang/Thread.java (Thread): Always create the ThreadLocalMap when creating a thread. (getThreadLocals) Don't lazily create the ThreadLocalMap. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/java/lang/ThreadLocalMap.java, * java/lang/ThreadLocalMap$Entry.h, * java/lang/ThreadLocalMap.h, * lib/java/lang/ThreadLocalMap.class, * lib/java/lang/ThreadLocalMap$Entry.class: Add the new files for the ThreadLocal patch. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/ChangeLog, * classpath/java/lang/InheritableThreadLocal.java, * classpath/java/lang/Thread.java, * classpath/java/lang/ThreadLocal.java: Merge Daniel Frampton's ThreadLocal patch. * gcj/javaprims.h: Updated. * java/lang/Thread.h: Regenerated. * java/lang/Thread.java: Replace WeakIdentityHashMap with ThreadLocalMap. (getThreadLocals()): Likewise. * java/lang/ThreadLocal.h: Regenerated. * java/lang/ThreadLocal.java: (computeNextHash()): New method. (ThreadLocal()): Initialise fastHash. (internalGet()): Updated to match Classpath's get(). (internalSet(Object)): Likewise for set(Object). (internalRemove()): Likewise for remove(). 2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure, * classpath/configure.ac: Resynchronise with Classpath's configure. * classpath/examples/Makefile.in: Add equivalent support for building as in tools/Makefile.in. * classpath/java/nio/Buffer.java, * classpath/java/nio/ByteBuffer.java, * classpath/java/nio/ByteBufferImpl.java, * classpath/java/nio/CharBuffer.java, * classpath/java/nio/CharBufferImpl.java, * classpath/java/nio/CharSequenceBuffer.java, * classpath/java/nio/CharViewBufferImpl.java, * classpath/java/nio/DirectByteBufferImpl.java, * classpath/java/nio/DoubleBuffer.java, * classpath/java/nio/DoubleBufferImpl.java, * classpath/java/nio/DoubleViewBufferImpl.java, * classpath/java/nio/FloatBuffer.java, * classpath/java/nio/FloatBufferImpl.java, * classpath/java/nio/FloatViewBufferImpl.java, * classpath/java/nio/IntBuffer.java, * classpath/java/nio/IntBufferImpl.java, * classpath/java/nio/IntViewBufferImpl.java, * classpath/java/nio/LongBuffer.java, * classpath/java/nio/LongBufferImpl.java, * classpath/java/nio/LongViewBufferImpl.java, * classpath/java/nio/MappedByteBuffer.java, * classpath/java/nio/MappedByteBufferImpl.java, * classpath/java/nio/ShortBuffer.java, * classpath/java/nio/ShortBufferImpl.java, * classpath/java/nio/ShortViewBufferImpl.java: Replace use of gnu.classpath.Pointer with gnu.gcj.RawData, and fix some formatting issues. * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt: Regenerated (later version of antlr). * java/nio/Buffer.h: Regenerated. * java/nio/Buffer.java: Ported changes from Classpath. * java/nio/ByteBuffer.h, * java/nio/CharBuffer.h: Regenerated. * java/nio/DirectByteBufferImpl.java: Ported changes from Classpath. * java/nio/DoubleBuffer.h, * java/nio/FloatBuffer.h, * java/nio/IntBuffer.h, * java/nio/LongBuffer.h, * java/nio/MappedByteBuffer.h, * java/nio/MappedByteBufferImpl.h: Regenerated. * java/nio/MappedByteBufferImpl.java: Ported changes from Classpath. * java/nio/ShortBuffer.h: Regenerated. 2008-09-24 Matthias Klose <doko@ubuntu.com> * configure.ac: Search for antlr.jar, if not configured. * configure: Regenerate. 2008-09-24 Matthias Klose <doko@ubuntu.com> * Makefile.am: Build a gjdoc binary, if enabled. * configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file. * Makefile.in, */Makefile.in, configure: Regenerate. 2008-09-22 Andrew Haley <aph@redhat.com> * java/lang/String.java (toString(char[], int, int)): New method. 2008-09-14 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080914). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --disable-gjdoc to classpath. * sources.am: Regenerated. * HACKING: Mention to build gjdoc in maintainer builds. * gnu/classpath/Configuration.java: Update classpath version. * gcj/javaprims.h: Update. 2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Replace natStringBuffer.cc and natStringBuilder.cc with natAbstractStringBuffer.cc. * Makefile.in: Regenerated. * java/lang/AbstractStringBuffer.java: (append(int)): Made native. (regionMatches(int,String)): Likewise. * java/lang/StringBuffer.h: Regenerated. * java/lang/StringBuffer.java: Remerged with GNU Classpath. * java/lang/StringBuilder.h: Regenerated. * java/lang/StringBuilder.java: Remerged with GNU Classpath. * java/lang/natAbstractStringBuffer.cc: Provide common native methods for StringBuffer and StringBuilder. * java/lang/natStringBuffer.cc, * java/lang/natStringBuilder.cc: Removed. 2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in, * classpath/configure: Regenerated. * gnu/gcj/util/natDebug.cc, * gnu/gcj/xlib/natColormap.cc, * gnu/gcj/xlib/natDisplay.cc, * gnu/gcj/xlib/natDrawable.cc, * gnu/gcj/xlib/natFont.cc, * gnu/gcj/xlib/natWMSizeHints.cc, * gnu/gcj/xlib/natWindow.cc, * gnu/gcj/xlib/natXImage.cc: Add :: prefix to namespaces. * java/io/CharArrayWriter.h, * java/lang/StringBuffer.h: Regenerated using patched gjavah. * java/lang/natStringBuffer.cc: Fix naming of append(jint). * java/sql/Timestamp.h: Regenerated using patched gjavah. * jni.cc: Rename p to functions to match change in GNU Classpath. * scripts/makemake.tcl: Switch gnu.java.math to BC compilation. * sources.am: Regenerated. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated location of Configuration.java. * classpath/lib/gnu/java/locale/LocaleData.class: Regenerated. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated with new Java files. * classpath/configure: Regenerated. * classpath/tools/Makefile.am: Add missing use of GJDOC_EX so --disable-gjdoc works. * classpath/tools/Makefile.in: Regenerated. 2008-08-15 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080811). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --with-fastjar to classpath, substitute new dummy value in classpath/gnu/classpath/Configuration.java.in, pass --disable-gjdoc to classpath. * scripts/makemake.tcl: * sources.am: Regenerated. * java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java: New, copied from classpath, use System instead of VMSystem. * java/lang/StringBuffer.java: Merge from classpath. * java/lang/ClassLoader.java: Merge from classpath. * gcj/javaprims.h: Update class definitions, remove _Jv_jobjectRefType, jobjectRefType definitions. libjava/classpath/ChangeLog.gcj: 2008-10-21 Matthias Klose <doko@ubuntu.com> * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ... * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here. * Update .class files. 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Always generate parser in the srcdir. 2008-10-21 Matthias Klose <doko@ubuntu.com> * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. 2008-10-20 Matthias Klose <doko@ubuntu.com> * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_java.m4: Revert previous change. * m4/ac_prog_javac.m4: Apply it here. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac.m4: Don't check for working javac, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. * Makefile.in, */Makefile.in: Regenerate. 2008-09-30 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for cantlr binary as well. 2008-09-29 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for antlr binary as well. 2008-09-28 Matthias Klose <doko@ubuntu.com> * PR libgcj/37636. Revert: 2008-02-20 Matthias Klose <doko@ubuntu.com> * tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change, Do copy resource files in JAVA_MAINTAINER_MODE only. * tools/Makefile.in: Regenerate. 2008-09-14 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4: Revert local changes. * m4/ac_prog_antlr.m4: Check for an runantlr binary. * tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER). * tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in GLIBJ_CLASSPATH. 2008-09-14 Matthias Klose <doko@ubuntu.com> Revert: Daniel Frampton <zyridium at zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-08-15 Matthias Klose <doko@ubuntu.com> * m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown args for javac. libjava/classpath/ChangeLog: 2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr.m4: Remove redundant checks. * tools/Makefile.am: Use gjdoc_gendir when calling antlr. 2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Remove superfluous AC_PROG_JAVA call. 2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr: Check for cantlr as well. * tools/Makefile.am: Only build GJDoc parser when both CREATE_GJDOC and CREATE_GJDOC_PARSER are on. 2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Add regen-gjdoc-parser option, and separate antlr tests. * m4/ac_prog_antlr.m4: Turn single test into AC_LIB_ANTLR and AC_PROG_ANTLR. * m4/ac_prog_java.m4: Quote tests. * tools/Makefile.am: Support CREATE_GJDOC_PARSER option. 2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am: Check lib directly as well as glibj.zip for boot classes. * m4/acinclude.m4: Only require the class files to be built to allow the tools and examples to be built, not the installation of glibj.zip. * tools/Makefile.am: Check lib directly as well as glibj.zip for boot classes. 2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am, * lib/Makefile.am: Add GCJ rules. * m4/ac_prog_javac.m4: Check whether JAVAC is gcj. * m4/ac_prog_javac_works.m4: Add GCJ rules. * m4/acinclude.m4: Don't bother checking for -J if using GCJ. * tools/Makefile.am: Add GCJ rules. 2007-08-23 Daniel Frampton <zyridium@zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk> * java/util/zip/ZipEntry.java: Use byte fields instead of integer fields, store the time as well as the DOS time and don't retain a global Calendar instance. (setDOSTime(int)): Set KNOWN_DOSTIME instead of KNOWN_TIME, and unset KNOWN_TIME. (getDOSTime()): Compute DOS time from UNIX time only when needed. (clone()): Provide cloning via the ZipEntry constructor where possible. (setTime(long)): Don't compute DOS time at this point. (getCalendar()): Removed. 2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/getopt/Parser.java: (setHeader(String)): Make synchronized. (setFooter(String)): Likewise. * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, (reset()): Make synchronized. (name(Class)): Likewise. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * gnu/java/nio/charset/ByteDecodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. * gnu/java/nio/charset/ByteEncodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. 2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/javah/ClassWrapper.java: (makeVtable()): Populate methodNameMap. (printMethods(CniPrintStream)): Always use pre-populated methodNameMap for bridge targets. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override annotation to allow compilation on javac < 1.6 and ecj < 3.4. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support new Escher API. * gnu/java/awt/peer/x/XImage.java (getSource): method implemented. * gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer for getSource. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedCharArray.java, * gnu/java/util/regex/CharIndexedCharSequence.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/CharIndexedString.java, * gnu/java/util/regex/CharIndexedStringBuffer.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REException.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenEndSub.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java: Fix indentation. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/RETokenStart.java: (getMaximumLength()): Add Override annotation. (matchThis(CharIndexed, REMatch)): Likewise. (returnsFixedLengthMatches()): Renamed from returnsFixedLengthmatches and added Override annotation. (findFixedLengthMatches(CharIndexed,REMatch,int)): Add Override annotation. (dump(CPStringBuilder)): Likewise. * gnu/javax/print/ipp/IppRequest.java: (RequestWriter.writeOperationAttributes(AttributeSet)): Throw exception, don't just create and drop it. * javax/management/MBeanServerPermission.java: (MBeanServerPermissionCollection.add(Permission)): Compare against individual Strings not the entire array, and store the result of replace. * javax/swing/text/html/StyleSheet.java: (setBaseFontSize(size)): Store result of trim(). 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/tools/FileObject.java: (openReader(boolean)): Document new parameter. 2008-03-27 Michael Franz <mvfranz@gmail.com> PR classpath/35690: * javax/tools/FileObject.java: (toUri()): Fix case from toURI. (openReader(boolean)): Add missing boolean argument. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/35487: * gnu/javax/management/Server.java: (beans): Change to ConcurrentHashMap. (defaultDomain): Make final. (outer): Likewise. (LazyListenersHolder): Added to wrap listeners, also now a ConcurrentHashMap, providing lazy initialisation safely. (sequenceNumber): Documented. (getBean(ObjectName)): Remove redundant cast. (addNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Remove map initialisation and use holder. (getObjectInstance(ObjectName)): Remove redundant cast. (registerMBean(Object,ObjectName)): Add bean atomically. (removeNotificationListener(ObjectName,NotificationListener)): Simplified. (removeNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Likewise. (notify(ObjectName,String)): Documented. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Server.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Translator.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/DefaultLoaderRepository.java, * javax/management/JMX.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanServerDelegate.java: Fix warnings due to generics. 2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/MBeanPermission.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerPermission.java: Fix warnings due to use of non-generic collections. 2008-08-25 Mario Torre <neugens@aicas.com> * gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is null to avoid NPE. 2008-08-22 Mario Torre <neugens@aicas.com> * gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null. 2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (reset()): Reset append position so we don't try and append to the end of the old input. 2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: Also allow versions of GJDoc from 0.8* on, as CVS is 0.8.0-pre. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. 2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Add taglets subdirectory to list of excluded paths when GJDoc is not compiled. 2008-08-19 David P Grove <groved@us.ibm.com> * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * native/jni/gstreamer-peer/gst_native_pipeline.c: (get_free_space(int)): Use #else not #elif when there is no condition. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/31895: * java/text/DecimalFormat.java: (setCurrency(Currency)): Update prefixes and suffixes when currency changes. * java/text/DecimalFormatSymbols.java: (DecimalFormatSymbols(Locale)): Set locale earlier so it can be used by setCurrency(Currency). (setCurrency(Currency)): Set the symbol correctly using the locale of the instance. * java/util/Currency.java: Throw error instead of just printing a message. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/activation/ActivationDataFlavor.java: Suppress warnings from public API. (mimeType): Made final. (representationClass): Added generic type and made final. (normalizeMimeTypeParameter(String,String)): Use CPStringBuilder. * javax/activation/CommandInfo.java: (verb): Made final. (className): Made final. * javax/activation/DataHandler.java: (dataSource): Made final. * javax/activation/FileDataSource.java: (file): Made final. * javax/activation/MailcapCommandMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeType.java: (toString()): Use CPStringBuilder. (getBaseType()): Likewise. * javax/activation/MimeTypeParameterList.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeTypeParseException.java: (MimeTypeParseException(String,String)): Use CPStringBuilder. * javax/activation/MimetypesFileTypeMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/URLDataSource.java: (url): Made final. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/activation/package.html, * resource/META-INF/mailcap.default, * resource/META-INF/mimetypes.default: Import GNU JAF CVS as of 17/08/2008. 2006-04-25 Archit Shah <ashah@redhat.com> * javax/activation/MimeTypeParameterList.java: Insert ';' separator before parameter list. 2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com> * javax/activation/ObjectDataContentHandler.java: Fixed typo. 2005-05-28 Chris Burdess <dog@bluezoo.org> * javax/activation/CommandMap.java, * javax/activation/MailcapCommandMap.java: Updated to JAF 1.1. 2004-06-09 Chris Burdess <dog@bluezoo.org> * javax/activation/MailcapCommandMap.java: Fixed bug whereby x-java prefix was not attempted. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * AUTHORS: Added Laszlo. 2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/30436: * java/util/Scanner.java: Fix package to be java.util and correct indentation. 2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at> PR classpath/30436: * java/util/Scanner.java: Initial implementation. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (toMatchResult()): Implemented. 2008-08-13 Joshua Sumali <jsumali@redhat.com> * doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo instead of invoke.texi. Remove invoke.texi from EXTRA_DIST. * doc/invoke.texi: Removed and merged into ... * doc/cp-tools.texinfo: Here 2008-08-12 Robert Schuster <robertschuster@fsfe.org> * native/jni/java-net/local.c (local_bind): Removed fprintf call, fixed access outside of array bounds. From-SVN: r141271
898 lines
24 KiB
Java
898 lines
24 KiB
Java
/* HTTPConnection.java --
|
|
Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package gnu.java.net.protocol.http;
|
|
|
|
import gnu.classpath.SystemProperties;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
import gnu.java.net.EmptyX509TrustManager;
|
|
|
|
import java.io.BufferedInputStream;
|
|
import java.io.BufferedOutputStream;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.net.InetSocketAddress;
|
|
import java.net.Socket;
|
|
import java.net.SocketException;
|
|
import java.security.GeneralSecurityException;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.Iterator;
|
|
import java.util.LinkedList;
|
|
import java.util.List;
|
|
import java.util.ListIterator;
|
|
import java.util.Map;
|
|
|
|
import javax.net.ssl.HandshakeCompletedListener;
|
|
import javax.net.ssl.SSLContext;
|
|
import javax.net.ssl.SSLSocket;
|
|
import javax.net.ssl.SSLSocketFactory;
|
|
import javax.net.ssl.TrustManager;
|
|
|
|
/**
|
|
* A connection to an HTTP server.
|
|
*
|
|
* @author Chris Burdess (dog@gnu.org)
|
|
*/
|
|
public class HTTPConnection
|
|
{
|
|
|
|
/**
|
|
* The default HTTP port.
|
|
*/
|
|
public static final int HTTP_PORT = 80;
|
|
|
|
/**
|
|
* The default HTTPS port.
|
|
*/
|
|
public static final int HTTPS_PORT = 443;
|
|
|
|
private static final String userAgent = SystemProperties.getProperty("http.agent");
|
|
|
|
/**
|
|
* The host name of the server to connect to.
|
|
*/
|
|
protected final String hostname;
|
|
|
|
/**
|
|
* The port to connect to.
|
|
*/
|
|
protected final int port;
|
|
|
|
/**
|
|
* Whether the connection should use transport level security (HTTPS).
|
|
*/
|
|
protected final boolean secure;
|
|
|
|
/**
|
|
* The connection timeout for connecting the underlying socket.
|
|
*/
|
|
protected final int connectionTimeout;
|
|
|
|
/**
|
|
* The read timeout for reads on the underlying socket.
|
|
*/
|
|
protected final int timeout;
|
|
|
|
/**
|
|
* The host name of the proxy to connect to.
|
|
*/
|
|
protected String proxyHostname;
|
|
|
|
/**
|
|
* The port on the proxy to connect to.
|
|
*/
|
|
protected int proxyPort;
|
|
|
|
/**
|
|
* The major version of HTTP supported by this client.
|
|
*/
|
|
protected int majorVersion;
|
|
|
|
/**
|
|
* The minor version of HTTP supported by this client.
|
|
*/
|
|
protected int minorVersion;
|
|
|
|
private final List<HandshakeCompletedListener> handshakeCompletedListeners;
|
|
|
|
/**
|
|
* The socket this connection communicates on.
|
|
*/
|
|
protected Socket socket;
|
|
|
|
/**
|
|
* The SSL socket factory to use.
|
|
*/
|
|
private SSLSocketFactory sslSocketFactory;
|
|
|
|
/**
|
|
* The socket input stream.
|
|
*/
|
|
protected InputStream in;
|
|
|
|
/**
|
|
* The socket output stream.
|
|
*/
|
|
protected OutputStream out;
|
|
|
|
/**
|
|
* Nonce values seen by this connection.
|
|
*/
|
|
private Map<String, Integer> nonceCounts;
|
|
|
|
/**
|
|
* The cookie manager for this connection.
|
|
*/
|
|
protected CookieManager cookieManager;
|
|
|
|
|
|
/**
|
|
* The pool that this connection is a member of (if any).
|
|
*/
|
|
private Pool pool;
|
|
|
|
/**
|
|
* Creates a new HTTP connection.
|
|
* @param hostname the name of the host to connect to
|
|
*/
|
|
public HTTPConnection(String hostname)
|
|
{
|
|
this(hostname, HTTP_PORT, false, 0, 0);
|
|
}
|
|
|
|
/**
|
|
* Creates a new HTTP or HTTPS connection.
|
|
* @param hostname the name of the host to connect to
|
|
* @param secure whether to use a secure connection
|
|
*/
|
|
public HTTPConnection(String hostname, boolean secure)
|
|
{
|
|
this(hostname, secure ? HTTPS_PORT : HTTP_PORT, secure, 0, 0);
|
|
}
|
|
|
|
/**
|
|
* Creates a new HTTP or HTTPS connection on the specified port.
|
|
* @param hostname the name of the host to connect to
|
|
* @param secure whether to use a secure connection
|
|
* @param connectionTimeout the connection timeout
|
|
* @param timeout the socket read timeout
|
|
*/
|
|
public HTTPConnection(String hostname, boolean secure,
|
|
int connectionTimeout, int timeout)
|
|
{
|
|
this(hostname, secure ? HTTPS_PORT : HTTP_PORT, secure,
|
|
connectionTimeout, timeout);
|
|
}
|
|
|
|
/**
|
|
* Creates a new HTTP connection on the specified port.
|
|
* @param hostname the name of the host to connect to
|
|
* @param port the port on the host to connect to
|
|
*/
|
|
public HTTPConnection(String hostname, int port)
|
|
{
|
|
this(hostname, port, false, 0, 0);
|
|
}
|
|
|
|
/**
|
|
* Creates a new HTTP or HTTPS connection on the specified port.
|
|
* @param hostname the name of the host to connect to
|
|
* @param port the port on the host to connect to
|
|
* @param secure whether to use a secure connection
|
|
*/
|
|
public HTTPConnection(String hostname, int port, boolean secure)
|
|
{
|
|
this(hostname, port, secure, 0, 0);
|
|
}
|
|
|
|
/**
|
|
* Creates a new HTTP or HTTPS connection on the specified port.
|
|
* @param hostname the name of the host to connect to
|
|
* @param port the port on the host to connect to
|
|
* @param secure whether to use a secure connection
|
|
* @param connectionTimeout the connection timeout
|
|
* @param timeout the socket read timeout
|
|
*
|
|
* @throws IllegalArgumentException if either connectionTimeout or
|
|
* timeout less than zero.
|
|
*/
|
|
public HTTPConnection(String hostname, int port, boolean secure,
|
|
int connectionTimeout, int timeout)
|
|
{
|
|
if (connectionTimeout < 0 || timeout < 0)
|
|
throw new IllegalArgumentException();
|
|
|
|
this.hostname = hostname;
|
|
this.port = port;
|
|
this.secure = secure;
|
|
this.connectionTimeout = connectionTimeout;
|
|
this.timeout = timeout;
|
|
majorVersion = minorVersion = 1;
|
|
handshakeCompletedListeners
|
|
= new ArrayList<HandshakeCompletedListener>(2);
|
|
}
|
|
|
|
/**
|
|
* Returns the name of the host to connect to.
|
|
*/
|
|
public String getHostName()
|
|
{
|
|
return hostname;
|
|
}
|
|
|
|
/**
|
|
* Returns the port on the host to connect to.
|
|
*/
|
|
public int getPort()
|
|
{
|
|
return port;
|
|
}
|
|
|
|
/**
|
|
* Indicates whether to use a secure connection or not.
|
|
*/
|
|
public boolean isSecure()
|
|
{
|
|
return secure;
|
|
}
|
|
|
|
/**
|
|
* Returns the HTTP version string supported by this connection.
|
|
* @see #majorVersion
|
|
* @see #minorVersion
|
|
*/
|
|
public String getVersion()
|
|
{
|
|
return "HTTP/" + majorVersion + '.' + minorVersion;
|
|
}
|
|
|
|
/**
|
|
* Sets the HTTP version supported by this connection.
|
|
* @param majorVersion the major version
|
|
* @param minorVersion the minor version
|
|
*/
|
|
public void setVersion(int majorVersion, int minorVersion)
|
|
{
|
|
if (majorVersion != 1)
|
|
{
|
|
throw new IllegalArgumentException("major version not supported: " +
|
|
majorVersion);
|
|
}
|
|
if (minorVersion < 0 || minorVersion > 1)
|
|
{
|
|
throw new IllegalArgumentException("minor version not supported: " +
|
|
minorVersion);
|
|
}
|
|
this.majorVersion = majorVersion;
|
|
this.minorVersion = minorVersion;
|
|
}
|
|
|
|
/**
|
|
* Directs this connection to use the specified proxy.
|
|
* @param hostname the proxy host name
|
|
* @param port the port on the proxy to connect to
|
|
*/
|
|
public void setProxy(String hostname, int port)
|
|
{
|
|
proxyHostname = hostname;
|
|
proxyPort = port;
|
|
}
|
|
|
|
/**
|
|
* Indicates whether this connection is using an HTTP proxy.
|
|
*/
|
|
public boolean isUsingProxy()
|
|
{
|
|
return (proxyHostname != null && proxyPort > 0);
|
|
}
|
|
|
|
/**
|
|
* Sets the cookie manager to use for this connection.
|
|
* @param cookieManager the cookie manager
|
|
*/
|
|
public void setCookieManager(CookieManager cookieManager)
|
|
{
|
|
this.cookieManager = cookieManager;
|
|
}
|
|
|
|
/**
|
|
* Returns the cookie manager in use for this connection.
|
|
*/
|
|
public CookieManager getCookieManager()
|
|
{
|
|
return cookieManager;
|
|
}
|
|
|
|
/**
|
|
* Manages a pool of HTTPConections. The pool will have a maximum
|
|
* size determined by the value of the maxConn parameter passed to
|
|
* the {@link #get} method. This value inevitably comes from the
|
|
* http.maxConnections system property. If the
|
|
* classpath.net.http.keepAliveTTL system property is set, that will
|
|
* be the maximum time (in seconds) that an idle connection will be
|
|
* maintained.
|
|
*/
|
|
static class Pool
|
|
{
|
|
/**
|
|
* Singleton instance of the pool.
|
|
*/
|
|
static Pool instance = new Pool();
|
|
|
|
/**
|
|
* The pool
|
|
*/
|
|
final LinkedList<HTTPConnection> connectionPool
|
|
= new LinkedList<HTTPConnection>();
|
|
|
|
/**
|
|
* Maximum size of the pool.
|
|
*/
|
|
int maxConnections;
|
|
|
|
/**
|
|
* If greater than zero, the maximum time a connection will remain
|
|
* int the pool.
|
|
*/
|
|
int connectionTTL;
|
|
|
|
/**
|
|
* A thread that removes connections older than connectionTTL.
|
|
*/
|
|
class Reaper
|
|
implements Runnable
|
|
{
|
|
public void run()
|
|
{
|
|
synchronized (Pool.this)
|
|
{
|
|
try
|
|
{
|
|
do
|
|
{
|
|
while (connectionPool.size() > 0)
|
|
{
|
|
long currentTime = System.currentTimeMillis();
|
|
|
|
HTTPConnection c =
|
|
(HTTPConnection)connectionPool.getFirst();
|
|
|
|
long waitTime = c.timeLastUsed
|
|
+ connectionTTL - currentTime;
|
|
|
|
if (waitTime <= 0)
|
|
removeOldest();
|
|
else
|
|
try
|
|
{
|
|
Pool.this.wait(waitTime);
|
|
}
|
|
catch (InterruptedException _)
|
|
{
|
|
// Ignore the interrupt.
|
|
}
|
|
}
|
|
// After the pool is empty, wait TTL to see if it
|
|
// is used again. This is because in the
|
|
// situation where a single thread is making HTTP
|
|
// requests to the same server it can remove the
|
|
// connection from the pool before the Reaper has
|
|
// a chance to start. This would cause the Reaper
|
|
// to exit if it were not for this extra delay.
|
|
// The result would be starting a Reaper thread
|
|
// for each HTTP request. With the delay we get
|
|
// at most one Reaper created each TTL.
|
|
try
|
|
{
|
|
Pool.this.wait(connectionTTL);
|
|
}
|
|
catch (InterruptedException _)
|
|
{
|
|
// Ignore the interrupt.
|
|
}
|
|
}
|
|
while (connectionPool.size() > 0);
|
|
}
|
|
finally
|
|
{
|
|
reaper = null;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Reaper reaper;
|
|
|
|
/**
|
|
* Private constructor to ensure singleton.
|
|
*/
|
|
private Pool()
|
|
{
|
|
}
|
|
|
|
/**
|
|
* Tests for a matching connection.
|
|
*
|
|
* @param c connection to match.
|
|
* @param h the host name.
|
|
* @param p the port.
|
|
* @param sec true if using https.
|
|
*
|
|
* @return true if c matches h, p, and sec.
|
|
*/
|
|
private static boolean matches(HTTPConnection c,
|
|
String h, int p, boolean sec)
|
|
{
|
|
return h.equals(c.hostname) && (p == c.port) && (sec == c.secure);
|
|
}
|
|
|
|
/**
|
|
* Get a pooled HTTPConnection. If there is an existing idle
|
|
* connection to the requested server it is returned. Otherwise a
|
|
* new connection is created.
|
|
*
|
|
* @param host the name of the host to connect to
|
|
* @param port the port on the host to connect to
|
|
* @param secure whether to use a secure connection
|
|
*
|
|
* @return the HTTPConnection.
|
|
*/
|
|
synchronized HTTPConnection get(String host,
|
|
int port,
|
|
boolean secure,
|
|
int connectionTimeout, int timeout)
|
|
{
|
|
String ttl =
|
|
SystemProperties.getProperty("classpath.net.http.keepAliveTTL");
|
|
connectionTTL = 10000;
|
|
if (ttl != null && ttl.length() > 0)
|
|
try
|
|
{
|
|
int v = 1000 * Integer.parseInt(ttl);
|
|
if (v >= 0)
|
|
connectionTTL = v;
|
|
}
|
|
catch (NumberFormatException _)
|
|
{
|
|
// Ignore.
|
|
}
|
|
|
|
String mc = SystemProperties.getProperty("http.maxConnections");
|
|
maxConnections = 5;
|
|
if (mc != null && mc.length() > 0)
|
|
try
|
|
{
|
|
int v = Integer.parseInt(mc);
|
|
if (v > 0)
|
|
maxConnections = v;
|
|
}
|
|
catch (NumberFormatException _)
|
|
{
|
|
// Ignore.
|
|
}
|
|
|
|
HTTPConnection c = null;
|
|
|
|
ListIterator it = connectionPool.listIterator(0);
|
|
while (it.hasNext())
|
|
{
|
|
HTTPConnection cc = (HTTPConnection)it.next();
|
|
if (matches(cc, host, port, secure))
|
|
{
|
|
c = cc;
|
|
it.remove();
|
|
// Update the timeout.
|
|
if (c.socket != null)
|
|
try
|
|
{
|
|
c.socket.setSoTimeout(timeout);
|
|
}
|
|
catch (SocketException _)
|
|
{
|
|
// Ignore.
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
if (c == null)
|
|
{
|
|
c = new HTTPConnection(host, port, secure,
|
|
connectionTimeout, timeout);
|
|
c.setPool(this);
|
|
}
|
|
return c;
|
|
}
|
|
|
|
/**
|
|
* Put an idle HTTPConnection back into the pool. If this causes
|
|
* the pool to be come too large, the oldest connection is removed
|
|
* and closed.
|
|
*
|
|
*/
|
|
synchronized void put(HTTPConnection c)
|
|
{
|
|
c.timeLastUsed = System.currentTimeMillis();
|
|
connectionPool.addLast(c);
|
|
|
|
// maxConnections must always be >= 1
|
|
while (connectionPool.size() >= maxConnections)
|
|
removeOldest();
|
|
|
|
if (connectionTTL > 0 && null == reaper) {
|
|
// If there is a connectionTTL, then the reaper has removed
|
|
// any stale connections, so we don't have to check for stale
|
|
// now. We do have to start a reaper though, as there is not
|
|
// one running now.
|
|
reaper = new Reaper();
|
|
Thread t = new Thread(reaper, "HTTPConnection.Reaper");
|
|
t.setDaemon(true);
|
|
t.start();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Remove the oldest connection from the pool and close it.
|
|
*/
|
|
void removeOldest()
|
|
{
|
|
HTTPConnection cx = (HTTPConnection)connectionPool.removeFirst();
|
|
try
|
|
{
|
|
cx.closeConnection();
|
|
}
|
|
catch (IOException ioe)
|
|
{
|
|
// Ignore it. We are just cleaning up.
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* The number of times this HTTPConnection has be used via keep-alive.
|
|
*/
|
|
int useCount;
|
|
|
|
/**
|
|
* If this HTTPConnection is in the pool, the time it was put there.
|
|
*/
|
|
long timeLastUsed;
|
|
|
|
/**
|
|
* Set the connection pool that this HTTPConnection is a member of.
|
|
* If left unset or set to null, it will not be a member of any pool
|
|
* and will not be a candidate for reuse.
|
|
*
|
|
* @param p the pool.
|
|
*/
|
|
void setPool(Pool p)
|
|
{
|
|
pool = p;
|
|
}
|
|
|
|
/**
|
|
* Signal that this HTTPConnection is no longer needed and can be
|
|
* returned to the connection pool.
|
|
*
|
|
*/
|
|
void release()
|
|
{
|
|
if (pool != null)
|
|
{
|
|
useCount++;
|
|
pool.put(this);
|
|
|
|
}
|
|
else
|
|
{
|
|
// If there is no pool, just close.
|
|
try
|
|
{
|
|
closeConnection();
|
|
}
|
|
catch (IOException ioe)
|
|
{
|
|
// Ignore it. We are just cleaning up.
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Creates a new request using this connection.
|
|
* @param method the HTTP method to invoke
|
|
* @param path the URI-escaped RFC2396 <code>abs_path</code> with
|
|
* optional query part
|
|
*/
|
|
public Request newRequest(String method, String path)
|
|
{
|
|
if (method == null || method.length() == 0)
|
|
{
|
|
throw new IllegalArgumentException("method must have non-zero length");
|
|
}
|
|
if (path == null || path.length() == 0)
|
|
{
|
|
path = "/";
|
|
}
|
|
Request ret = new Request(this, method, path);
|
|
if ((secure && port != HTTPS_PORT) ||
|
|
(!secure && port != HTTP_PORT))
|
|
{
|
|
ret.setHeader("Host", hostname + ":" + port);
|
|
}
|
|
else
|
|
{
|
|
ret.setHeader("Host", hostname);
|
|
}
|
|
ret.setHeader("User-Agent", userAgent);
|
|
ret.setHeader("Connection", "keep-alive");
|
|
ret.setHeader("Accept-Encoding",
|
|
"chunked;q=1.0, gzip;q=0.9, deflate;q=0.8, " +
|
|
"identity;q=0.6, *;q=0");
|
|
if (cookieManager != null)
|
|
{
|
|
Cookie[] cookies = cookieManager.getCookies(hostname, secure, path);
|
|
if (cookies != null && cookies.length > 0)
|
|
{
|
|
CPStringBuilder buf = new CPStringBuilder();
|
|
buf.append("$Version=1");
|
|
for (int i = 0; i < cookies.length; i++)
|
|
{
|
|
buf.append(',');
|
|
buf.append(' ');
|
|
buf.append(cookies[i].toString());
|
|
}
|
|
ret.setHeader("Cookie", buf.toString());
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/**
|
|
* Closes this connection.
|
|
*/
|
|
public void close()
|
|
throws IOException
|
|
{
|
|
closeConnection();
|
|
}
|
|
|
|
/**
|
|
* Retrieves the socket associated with this connection.
|
|
* This creates the socket if necessary.
|
|
*/
|
|
protected synchronized Socket getSocket()
|
|
throws IOException
|
|
{
|
|
if (socket == null)
|
|
{
|
|
String connectHostname = hostname;
|
|
int connectPort = port;
|
|
if (isUsingProxy())
|
|
{
|
|
connectHostname = proxyHostname;
|
|
connectPort = proxyPort;
|
|
}
|
|
socket = new Socket();
|
|
InetSocketAddress address =
|
|
new InetSocketAddress(connectHostname, connectPort);
|
|
if (connectionTimeout > 0)
|
|
{
|
|
socket.connect(address, connectionTimeout);
|
|
}
|
|
else
|
|
{
|
|
socket.connect(address);
|
|
}
|
|
if (timeout > 0)
|
|
{
|
|
socket.setSoTimeout(timeout);
|
|
}
|
|
if (secure)
|
|
{
|
|
try
|
|
{
|
|
SSLSocketFactory factory = getSSLSocketFactory();
|
|
SSLSocket ss =
|
|
(SSLSocket) factory.createSocket(socket, connectHostname,
|
|
connectPort, true);
|
|
String[] protocols = { "TLSv1", "SSLv3" };
|
|
ss.setEnabledProtocols(protocols);
|
|
ss.setUseClientMode(true);
|
|
synchronized (handshakeCompletedListeners)
|
|
{
|
|
if (!handshakeCompletedListeners.isEmpty())
|
|
{
|
|
for (Iterator i =
|
|
handshakeCompletedListeners.iterator();
|
|
i.hasNext(); )
|
|
{
|
|
HandshakeCompletedListener l =
|
|
(HandshakeCompletedListener) i.next();
|
|
ss.addHandshakeCompletedListener(l);
|
|
}
|
|
}
|
|
}
|
|
ss.startHandshake();
|
|
socket = ss;
|
|
}
|
|
catch (GeneralSecurityException e)
|
|
{
|
|
throw new IOException(e.getMessage());
|
|
}
|
|
}
|
|
in = socket.getInputStream();
|
|
in = new BufferedInputStream(in);
|
|
out = socket.getOutputStream();
|
|
out = new BufferedOutputStream(out);
|
|
}
|
|
return socket;
|
|
}
|
|
|
|
SSLSocketFactory getSSLSocketFactory()
|
|
throws GeneralSecurityException
|
|
{
|
|
if (sslSocketFactory == null)
|
|
{
|
|
TrustManager tm = new EmptyX509TrustManager();
|
|
SSLContext context = SSLContext.getInstance("SSL");
|
|
TrustManager[] trust = new TrustManager[] { tm };
|
|
context.init(null, trust, null);
|
|
sslSocketFactory = context.getSocketFactory();
|
|
}
|
|
return sslSocketFactory;
|
|
}
|
|
|
|
void setSSLSocketFactory(SSLSocketFactory factory)
|
|
{
|
|
sslSocketFactory = factory;
|
|
}
|
|
|
|
protected synchronized InputStream getInputStream()
|
|
throws IOException
|
|
{
|
|
if (socket == null)
|
|
{
|
|
getSocket();
|
|
}
|
|
return in;
|
|
}
|
|
|
|
protected synchronized OutputStream getOutputStream()
|
|
throws IOException
|
|
{
|
|
if (socket == null)
|
|
{
|
|
getSocket();
|
|
}
|
|
return out;
|
|
}
|
|
|
|
/**
|
|
* Closes the underlying socket, if any.
|
|
*/
|
|
protected synchronized void closeConnection()
|
|
throws IOException
|
|
{
|
|
if (socket != null)
|
|
{
|
|
try
|
|
{
|
|
socket.close();
|
|
}
|
|
finally
|
|
{
|
|
socket = null;
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns a URI representing the connection.
|
|
* This does not include any request path component.
|
|
*/
|
|
protected String getURI()
|
|
{
|
|
CPStringBuilder buf = new CPStringBuilder();
|
|
buf.append(secure ? "https://" : "http://");
|
|
buf.append(hostname);
|
|
if (secure)
|
|
{
|
|
if (port != HTTPConnection.HTTPS_PORT)
|
|
{
|
|
buf.append(':');
|
|
buf.append(port);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (port != HTTPConnection.HTTP_PORT)
|
|
{
|
|
buf.append(':');
|
|
buf.append(port);
|
|
}
|
|
}
|
|
return buf.toString();
|
|
}
|
|
|
|
/**
|
|
* Get the number of times the specified nonce has been seen by this
|
|
* connection.
|
|
*/
|
|
int getNonceCount(String nonce)
|
|
{
|
|
if (nonceCounts == null)
|
|
{
|
|
return 0;
|
|
}
|
|
return nonceCounts.get(nonce).intValue();
|
|
}
|
|
|
|
/**
|
|
* Increment the number of times the specified nonce has been seen.
|
|
*/
|
|
void incrementNonce(String nonce)
|
|
{
|
|
int current = getNonceCount(nonce);
|
|
if (nonceCounts == null)
|
|
{
|
|
nonceCounts = new HashMap<String, Integer>();
|
|
}
|
|
nonceCounts.put(nonce, new Integer(current + 1));
|
|
}
|
|
|
|
// -- Events --
|
|
|
|
void addHandshakeCompletedListener(HandshakeCompletedListener l)
|
|
{
|
|
synchronized (handshakeCompletedListeners)
|
|
{
|
|
handshakeCompletedListeners.add(l);
|
|
}
|
|
}
|
|
void removeHandshakeCompletedListener(HandshakeCompletedListener l)
|
|
{
|
|
synchronized (handshakeCompletedListeners)
|
|
{
|
|
handshakeCompletedListeners.remove(l);
|
|
}
|
|
}
|
|
|
|
}
|
|
|