
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
858 lines
25 KiB
Java
858 lines
25 KiB
Java
/* Request.java --
|
|
Copyright (C) 2004, 2005, 2006, 2007 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.java.lang.CPStringBuilder;
|
|
import gnu.java.net.LineInputStream;
|
|
import gnu.java.util.Base64;
|
|
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.OutputStream;
|
|
import java.net.ProtocolException;
|
|
import java.security.MessageDigest;
|
|
import java.security.NoSuchAlgorithmException;
|
|
import java.text.DateFormat;
|
|
import java.text.ParseException;
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.Map;
|
|
import java.util.Properties;
|
|
import java.util.zip.GZIPInputStream;
|
|
import java.util.zip.InflaterInputStream;
|
|
|
|
/**
|
|
* A single HTTP request.
|
|
*
|
|
* @author Chris Burdess (dog@gnu.org)
|
|
*/
|
|
public class Request
|
|
{
|
|
|
|
/**
|
|
* The connection context in which this request is invoked.
|
|
*/
|
|
protected final HTTPConnection connection;
|
|
|
|
/**
|
|
* The HTTP method to invoke.
|
|
*/
|
|
protected final String method;
|
|
|
|
/**
|
|
* The path identifying the resource.
|
|
* This string must conform to the abs_path definition given in RFC2396,
|
|
* with an optional "?query" part, and must be URI-escaped by the caller.
|
|
*/
|
|
protected final String path;
|
|
|
|
/**
|
|
* The headers in this request.
|
|
*/
|
|
protected final Headers requestHeaders;
|
|
|
|
/**
|
|
* The request body provider.
|
|
*/
|
|
protected RequestBodyWriter requestBodyWriter;
|
|
|
|
/**
|
|
* Map of response header handlers.
|
|
*/
|
|
protected Map<String, ResponseHeaderHandler> responseHeaderHandlers;
|
|
|
|
/**
|
|
* The authenticator.
|
|
*/
|
|
protected Authenticator authenticator;
|
|
|
|
/**
|
|
* Whether this request has been dispatched yet.
|
|
*/
|
|
private boolean dispatched;
|
|
|
|
/**
|
|
* Constructor for a new request.
|
|
* @param connection the connection context
|
|
* @param method the HTTP method
|
|
* @param path the resource path including query part
|
|
*/
|
|
protected Request(HTTPConnection connection, String method,
|
|
String path)
|
|
{
|
|
this.connection = connection;
|
|
this.method = method;
|
|
this.path = path;
|
|
requestHeaders = new Headers();
|
|
responseHeaderHandlers = new HashMap<String, ResponseHeaderHandler>();
|
|
}
|
|
|
|
/**
|
|
* Returns the connection associated with this request.
|
|
* @see #connection
|
|
*/
|
|
public HTTPConnection getConnection()
|
|
{
|
|
return connection;
|
|
}
|
|
|
|
/**
|
|
* Returns the HTTP method to invoke.
|
|
* @see #method
|
|
*/
|
|
public String getMethod()
|
|
{
|
|
return method;
|
|
}
|
|
|
|
/**
|
|
* Returns the resource path.
|
|
* @see #path
|
|
*/
|
|
public String getPath()
|
|
{
|
|
return path;
|
|
}
|
|
|
|
/**
|
|
* Returns the full request-URI represented by this request, as specified
|
|
* by HTTP/1.1.
|
|
*/
|
|
public String getRequestURI()
|
|
{
|
|
return connection.getURI() + path;
|
|
}
|
|
|
|
/**
|
|
* Returns the headers in this request.
|
|
*/
|
|
public Headers getHeaders()
|
|
{
|
|
return requestHeaders;
|
|
}
|
|
|
|
/**
|
|
* Returns the value of the specified header in this request.
|
|
* @param name the header name
|
|
*/
|
|
public String getHeader(String name)
|
|
{
|
|
return requestHeaders.getValue(name);
|
|
}
|
|
|
|
/**
|
|
* Returns the value of the specified header in this request as an integer.
|
|
* @param name the header name
|
|
*/
|
|
public int getIntHeader(String name)
|
|
{
|
|
return requestHeaders.getIntValue(name);
|
|
}
|
|
|
|
/**
|
|
* Returns the value of the specified header in this request as a date.
|
|
* @param name the header name
|
|
*/
|
|
public Date getDateHeader(String name)
|
|
{
|
|
return requestHeaders.getDateValue(name);
|
|
}
|
|
|
|
/**
|
|
* Sets the specified header in this request.
|
|
* @param name the header name
|
|
* @param value the header value
|
|
*/
|
|
public void setHeader(String name, String value)
|
|
{
|
|
requestHeaders.put(name, value);
|
|
}
|
|
|
|
/**
|
|
* Convenience method to set the entire request body.
|
|
* @param requestBody the request body content
|
|
*/
|
|
public void setRequestBody(byte[] requestBody)
|
|
{
|
|
setRequestBodyWriter(new ByteArrayRequestBodyWriter(requestBody));
|
|
}
|
|
|
|
/**
|
|
* Sets the request body provider.
|
|
* @param requestBodyWriter the handler used to obtain the request body
|
|
*/
|
|
public void setRequestBodyWriter(RequestBodyWriter requestBodyWriter)
|
|
{
|
|
this.requestBodyWriter = requestBodyWriter;
|
|
}
|
|
|
|
/**
|
|
* Sets a callback handler to be invoked for the specified header name.
|
|
* @param name the header name
|
|
* @param handler the handler to receive the value for the header
|
|
*/
|
|
public void setResponseHeaderHandler(String name,
|
|
ResponseHeaderHandler handler)
|
|
{
|
|
responseHeaderHandlers.put(name, handler);
|
|
}
|
|
|
|
/**
|
|
* Sets an authenticator that can be used to handle authentication
|
|
* automatically.
|
|
* @param authenticator the authenticator
|
|
*/
|
|
public void setAuthenticator(Authenticator authenticator)
|
|
{
|
|
this.authenticator = authenticator;
|
|
}
|
|
|
|
/**
|
|
* Dispatches this request.
|
|
* A request can only be dispatched once; calling this method a second
|
|
* time results in a protocol exception.
|
|
* @exception IOException if an I/O error occurred
|
|
* @return an HTTP response object representing the result of the operation
|
|
*/
|
|
public Response dispatch()
|
|
throws IOException
|
|
{
|
|
if (dispatched)
|
|
{
|
|
throw new ProtocolException("request already dispatched");
|
|
}
|
|
final String CRLF = "\r\n";
|
|
final String HEADER_SEP = ": ";
|
|
final String US_ASCII = "US-ASCII";
|
|
final String version = connection.getVersion();
|
|
Response response;
|
|
int contentLength = -1;
|
|
boolean retry = false;
|
|
int attempts = 0;
|
|
boolean expectingContinue = false;
|
|
if (requestBodyWriter != null)
|
|
{
|
|
contentLength = requestBodyWriter.getContentLength();
|
|
String expect = getHeader("Expect");
|
|
if (expect != null && expect.equals("100-continue"))
|
|
{
|
|
expectingContinue = true;
|
|
}
|
|
else
|
|
{
|
|
setHeader("Content-Length", Integer.toString(contentLength));
|
|
}
|
|
}
|
|
|
|
try
|
|
{
|
|
// Loop while authentication fails or continue
|
|
do
|
|
{
|
|
retry = false;
|
|
|
|
// Get socket output and input streams
|
|
OutputStream out = connection.getOutputStream();
|
|
|
|
// Request line
|
|
String requestUri = path;
|
|
if (connection.isUsingProxy() &&
|
|
!"*".equals(requestUri) &&
|
|
!"CONNECT".equals(method))
|
|
{
|
|
requestUri = getRequestURI();
|
|
}
|
|
String line = method + ' ' + requestUri + ' ' + version + CRLF;
|
|
out.write(line.getBytes(US_ASCII));
|
|
// Request headers
|
|
for (Headers.HeaderElement elt : requestHeaders)
|
|
{
|
|
line = elt.name + HEADER_SEP + elt.value + CRLF;
|
|
out.write(line.getBytes(US_ASCII));
|
|
}
|
|
out.write(CRLF.getBytes(US_ASCII));
|
|
// Request body
|
|
if (requestBodyWriter != null && !expectingContinue)
|
|
{
|
|
byte[] buffer = new byte[4096];
|
|
int len;
|
|
int count = 0;
|
|
|
|
requestBodyWriter.reset();
|
|
do
|
|
{
|
|
len = requestBodyWriter.write(buffer);
|
|
if (len > 0)
|
|
{
|
|
out.write(buffer, 0, len);
|
|
}
|
|
count += len;
|
|
}
|
|
while (len > -1 && count < contentLength);
|
|
}
|
|
out.flush();
|
|
// Get response
|
|
while(true)
|
|
{
|
|
response = readResponse(connection.getInputStream());
|
|
int sc = response.getCode();
|
|
if (sc == 401 && authenticator != null)
|
|
{
|
|
if (authenticate(response, attempts++))
|
|
{
|
|
retry = true;
|
|
}
|
|
}
|
|
else if (sc == 100)
|
|
{
|
|
if (expectingContinue)
|
|
{
|
|
requestHeaders.remove("Expect");
|
|
setHeader("Content-Length",
|
|
Integer.toString(contentLength));
|
|
expectingContinue = false;
|
|
retry = true;
|
|
}
|
|
else
|
|
{
|
|
// A conforming server can send an unsoliceted
|
|
// Continue response but *should* not (RFC 2616
|
|
// sec 8.2.3). Ignore the bogus Continue
|
|
// response and get the real response that
|
|
// should follow
|
|
continue;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
while (retry);
|
|
}
|
|
catch (IOException e)
|
|
{
|
|
connection.close();
|
|
throw e;
|
|
}
|
|
return response;
|
|
}
|
|
|
|
Response readResponse(InputStream in)
|
|
throws IOException
|
|
{
|
|
String line;
|
|
int len;
|
|
|
|
// Read response status line
|
|
LineInputStream lis = new LineInputStream(in);
|
|
|
|
line = lis.readLine();
|
|
if (line == null)
|
|
{
|
|
throw new ProtocolException("Peer closed connection");
|
|
}
|
|
if (!line.startsWith("HTTP/"))
|
|
{
|
|
throw new ProtocolException(line);
|
|
}
|
|
len = line.length();
|
|
int start = 5, end = 6;
|
|
while (line.charAt(end) != '.')
|
|
{
|
|
end++;
|
|
}
|
|
int majorVersion = Integer.parseInt(line.substring(start, end));
|
|
start = end + 1;
|
|
end = start + 1;
|
|
while (line.charAt(end) != ' ')
|
|
{
|
|
end++;
|
|
}
|
|
int minorVersion = Integer.parseInt(line.substring(start, end));
|
|
start = end + 1;
|
|
end = start + 3;
|
|
int code = Integer.parseInt(line.substring(start, end));
|
|
String message = line.substring(end + 1, len - 1);
|
|
// Read response headers
|
|
Headers responseHeaders = new Headers();
|
|
responseHeaders.parse(lis);
|
|
notifyHeaderHandlers(responseHeaders);
|
|
InputStream body = null;
|
|
|
|
switch (code)
|
|
{
|
|
case 100:
|
|
break;
|
|
case 204:
|
|
case 205:
|
|
case 304:
|
|
body = createResponseBodyStream(responseHeaders, majorVersion,
|
|
minorVersion, in, false);
|
|
break;
|
|
default:
|
|
body = createResponseBodyStream(responseHeaders, majorVersion,
|
|
minorVersion, in, true);
|
|
}
|
|
|
|
// Construct response
|
|
Response ret = new Response(majorVersion, minorVersion, code,
|
|
message, responseHeaders, body);
|
|
return ret;
|
|
}
|
|
|
|
void notifyHeaderHandlers(Headers headers)
|
|
{
|
|
for (Headers.HeaderElement entry : headers)
|
|
{
|
|
// Handle Set-Cookie
|
|
if ("Set-Cookie".equalsIgnoreCase(entry.name))
|
|
handleSetCookie(entry.value);
|
|
|
|
ResponseHeaderHandler handler =
|
|
(ResponseHeaderHandler) responseHeaderHandlers.get(entry.name);
|
|
if (handler != null)
|
|
handler.setValue(entry.value);
|
|
}
|
|
}
|
|
|
|
private InputStream createResponseBodyStream(Headers responseHeaders,
|
|
int majorVersion,
|
|
int minorVersion,
|
|
InputStream in,
|
|
boolean mayHaveBody)
|
|
throws IOException
|
|
{
|
|
long contentLength = -1;
|
|
|
|
// Persistent connections are the default in HTTP/1.1
|
|
boolean doClose = "close".equalsIgnoreCase(getHeader("Connection")) ||
|
|
"close".equalsIgnoreCase(responseHeaders.getValue("Connection")) ||
|
|
(connection.majorVersion == 1 && connection.minorVersion == 0) ||
|
|
(majorVersion == 1 && minorVersion == 0);
|
|
|
|
String transferCoding = responseHeaders.getValue("Transfer-Encoding");
|
|
if ("HEAD".equals(method) || !mayHaveBody)
|
|
{
|
|
// Special case no body.
|
|
in = new LimitedLengthInputStream(in, 0, true, connection, doClose);
|
|
}
|
|
else if ("chunked".equalsIgnoreCase(transferCoding))
|
|
{
|
|
in = new LimitedLengthInputStream(in, -1, false, connection, doClose);
|
|
|
|
in = new ChunkedInputStream(in, responseHeaders);
|
|
}
|
|
else
|
|
{
|
|
contentLength = responseHeaders.getLongValue("Content-Length");
|
|
|
|
if (contentLength < 0)
|
|
doClose = true; // No Content-Length, must close.
|
|
|
|
in = new LimitedLengthInputStream(in, contentLength,
|
|
contentLength >= 0,
|
|
connection, doClose);
|
|
}
|
|
String contentCoding = responseHeaders.getValue("Content-Encoding");
|
|
if (contentCoding != null && !"identity".equals(contentCoding))
|
|
{
|
|
if ("gzip".equals(contentCoding))
|
|
{
|
|
in = new GZIPInputStream(in);
|
|
}
|
|
else if ("deflate".equals(contentCoding))
|
|
{
|
|
in = new InflaterInputStream(in);
|
|
}
|
|
else
|
|
{
|
|
throw new ProtocolException("Unsupported Content-Encoding: " +
|
|
contentCoding);
|
|
}
|
|
// Remove the Content-Encoding header because the content is
|
|
// no longer compressed.
|
|
responseHeaders.remove("Content-Encoding");
|
|
}
|
|
return in;
|
|
}
|
|
|
|
boolean authenticate(Response response, int attempts)
|
|
throws IOException
|
|
{
|
|
String challenge = response.getHeader("WWW-Authenticate");
|
|
if (challenge == null)
|
|
{
|
|
challenge = response.getHeader("Proxy-Authenticate");
|
|
}
|
|
int si = challenge.indexOf(' ');
|
|
String scheme = (si == -1) ? challenge : challenge.substring(0, si);
|
|
if ("Basic".equalsIgnoreCase(scheme))
|
|
{
|
|
Properties params = parseAuthParams(challenge.substring(si + 1));
|
|
String realm = params.getProperty("realm");
|
|
Credentials creds = authenticator.getCredentials(realm, attempts);
|
|
String userPass = creds.getUsername() + ':' + creds.getPassword();
|
|
byte[] b_userPass = userPass.getBytes("US-ASCII");
|
|
byte[] b_encoded = Base64.encode(b_userPass).getBytes("US-ASCII");
|
|
String authorization =
|
|
scheme + " " + new String(b_encoded, "US-ASCII");
|
|
setHeader("Authorization", authorization);
|
|
return true;
|
|
}
|
|
else if ("Digest".equalsIgnoreCase(scheme))
|
|
{
|
|
Properties params = parseAuthParams(challenge.substring(si + 1));
|
|
String realm = params.getProperty("realm");
|
|
String nonce = params.getProperty("nonce");
|
|
String qop = params.getProperty("qop");
|
|
String algorithm = params.getProperty("algorithm");
|
|
String digestUri = getRequestURI();
|
|
Credentials creds = authenticator.getCredentials(realm, attempts);
|
|
String username = creds.getUsername();
|
|
String password = creds.getPassword();
|
|
connection.incrementNonce(nonce);
|
|
try
|
|
{
|
|
MessageDigest md5 = MessageDigest.getInstance("MD5");
|
|
final byte[] COLON = { 0x3a };
|
|
|
|
// Calculate H(A1)
|
|
md5.reset();
|
|
md5.update(username.getBytes("US-ASCII"));
|
|
md5.update(COLON);
|
|
md5.update(realm.getBytes("US-ASCII"));
|
|
md5.update(COLON);
|
|
md5.update(password.getBytes("US-ASCII"));
|
|
byte[] ha1 = md5.digest();
|
|
if ("md5-sess".equals(algorithm))
|
|
{
|
|
byte[] cnonce = generateNonce();
|
|
md5.reset();
|
|
md5.update(ha1);
|
|
md5.update(COLON);
|
|
md5.update(nonce.getBytes("US-ASCII"));
|
|
md5.update(COLON);
|
|
md5.update(cnonce);
|
|
ha1 = md5.digest();
|
|
}
|
|
String ha1Hex = toHexString(ha1);
|
|
|
|
// Calculate H(A2)
|
|
md5.reset();
|
|
md5.update(method.getBytes("US-ASCII"));
|
|
md5.update(COLON);
|
|
md5.update(digestUri.getBytes("US-ASCII"));
|
|
if ("auth-int".equals(qop))
|
|
{
|
|
byte[] hEntity = null; // TODO hash of entity body
|
|
md5.update(COLON);
|
|
md5.update(hEntity);
|
|
}
|
|
byte[] ha2 = md5.digest();
|
|
String ha2Hex = toHexString(ha2);
|
|
|
|
// Calculate response
|
|
md5.reset();
|
|
md5.update(ha1Hex.getBytes("US-ASCII"));
|
|
md5.update(COLON);
|
|
md5.update(nonce.getBytes("US-ASCII"));
|
|
if ("auth".equals(qop) || "auth-int".equals(qop))
|
|
{
|
|
String nc = getNonceCount(nonce);
|
|
byte[] cnonce = generateNonce();
|
|
md5.update(COLON);
|
|
md5.update(nc.getBytes("US-ASCII"));
|
|
md5.update(COLON);
|
|
md5.update(cnonce);
|
|
md5.update(COLON);
|
|
md5.update(qop.getBytes("US-ASCII"));
|
|
}
|
|
md5.update(COLON);
|
|
md5.update(ha2Hex.getBytes("US-ASCII"));
|
|
String digestResponse = toHexString(md5.digest());
|
|
|
|
String authorization = scheme +
|
|
" username=\"" + username + "\"" +
|
|
" realm=\"" + realm + "\"" +
|
|
" nonce=\"" + nonce + "\"" +
|
|
" uri=\"" + digestUri + "\"" +
|
|
" response=\"" + digestResponse + "\"";
|
|
setHeader("Authorization", authorization);
|
|
return true;
|
|
}
|
|
catch (NoSuchAlgorithmException e)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
// Scheme not recognised
|
|
return false;
|
|
}
|
|
|
|
Properties parseAuthParams(String text)
|
|
{
|
|
int len = text.length();
|
|
String key = null;
|
|
CPStringBuilder buf = new CPStringBuilder();
|
|
Properties ret = new Properties();
|
|
boolean inQuote = false;
|
|
for (int i = 0; i < len; i++)
|
|
{
|
|
char c = text.charAt(i);
|
|
if (c == '"')
|
|
{
|
|
inQuote = !inQuote;
|
|
}
|
|
else if (c == '=' && key == null)
|
|
{
|
|
key = buf.toString().trim();
|
|
buf.setLength(0);
|
|
}
|
|
else if (c == ' ' && !inQuote)
|
|
{
|
|
String value = unquote(buf.toString().trim());
|
|
ret.put(key, value);
|
|
key = null;
|
|
buf.setLength(0);
|
|
}
|
|
else if (c != ',' || (i <(len - 1) && text.charAt(i + 1) != ' '))
|
|
{
|
|
buf.append(c);
|
|
}
|
|
}
|
|
if (key != null)
|
|
{
|
|
String value = unquote(buf.toString().trim());
|
|
ret.put(key, value);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
String unquote(String text)
|
|
{
|
|
int len = text.length();
|
|
if (len > 0 && text.charAt(0) == '"' && text.charAt(len - 1) == '"')
|
|
{
|
|
return text.substring(1, len - 1);
|
|
}
|
|
return text;
|
|
}
|
|
|
|
/**
|
|
* Returns the number of times the specified nonce value has been seen.
|
|
* This always returns an 8-byte 0-padded hexadecimal string.
|
|
*/
|
|
String getNonceCount(String nonce)
|
|
{
|
|
int nc = connection.getNonceCount(nonce);
|
|
String hex = Integer.toHexString(nc);
|
|
CPStringBuilder buf = new CPStringBuilder();
|
|
for (int i = 8 - hex.length(); i > 0; i--)
|
|
{
|
|
buf.append('0');
|
|
}
|
|
buf.append(hex);
|
|
return buf.toString();
|
|
}
|
|
|
|
/**
|
|
* Client nonce value.
|
|
*/
|
|
byte[] nonce;
|
|
|
|
/**
|
|
* Generates a new client nonce value.
|
|
*/
|
|
byte[] generateNonce()
|
|
throws IOException, NoSuchAlgorithmException
|
|
{
|
|
if (nonce == null)
|
|
{
|
|
long time = System.currentTimeMillis();
|
|
MessageDigest md5 = MessageDigest.getInstance("MD5");
|
|
md5.update(Long.toString(time).getBytes("US-ASCII"));
|
|
nonce = md5.digest();
|
|
}
|
|
return nonce;
|
|
}
|
|
|
|
String toHexString(byte[] bytes)
|
|
{
|
|
char[] ret = new char[bytes.length * 2];
|
|
for (int i = 0, j = 0; i < bytes.length; i++)
|
|
{
|
|
int c =(int) bytes[i];
|
|
if (c < 0)
|
|
{
|
|
c += 0x100;
|
|
}
|
|
ret[j++] = Character.forDigit(c / 0x10, 0x10);
|
|
ret[j++] = Character.forDigit(c % 0x10, 0x10);
|
|
}
|
|
return new String(ret);
|
|
}
|
|
|
|
/**
|
|
* Parse the specified cookie list and notify the cookie manager.
|
|
*/
|
|
void handleSetCookie(String text)
|
|
{
|
|
CookieManager cookieManager = connection.getCookieManager();
|
|
if (cookieManager == null)
|
|
{
|
|
return;
|
|
}
|
|
String name = null;
|
|
String value = null;
|
|
String comment = null;
|
|
String domain = connection.getHostName();
|
|
String path = this.path;
|
|
int lsi = path.lastIndexOf('/');
|
|
if (lsi != -1)
|
|
{
|
|
path = path.substring(0, lsi);
|
|
}
|
|
boolean secure = false;
|
|
Date expires = null;
|
|
|
|
int len = text.length();
|
|
String attr = null;
|
|
CPStringBuilder buf = new CPStringBuilder();
|
|
boolean inQuote = false;
|
|
for (int i = 0; i <= len; i++)
|
|
{
|
|
char c =(i == len) ? '\u0000' : text.charAt(i);
|
|
if (c == '"')
|
|
{
|
|
inQuote = !inQuote;
|
|
}
|
|
else if (!inQuote)
|
|
{
|
|
if (c == '=' && attr == null)
|
|
{
|
|
attr = buf.toString().trim();
|
|
buf.setLength(0);
|
|
}
|
|
else if (c == ';' || i == len || c == ',')
|
|
{
|
|
String val = unquote(buf.toString().trim());
|
|
if (name == null)
|
|
{
|
|
name = attr;
|
|
value = val;
|
|
}
|
|
else if ("Comment".equalsIgnoreCase(attr))
|
|
{
|
|
comment = val;
|
|
}
|
|
else if ("Domain".equalsIgnoreCase(attr))
|
|
{
|
|
domain = val;
|
|
}
|
|
else if ("Path".equalsIgnoreCase(attr))
|
|
{
|
|
path = val;
|
|
}
|
|
else if ("Secure".equalsIgnoreCase(val))
|
|
{
|
|
secure = true;
|
|
}
|
|
else if ("Max-Age".equalsIgnoreCase(attr))
|
|
{
|
|
int delta = Integer.parseInt(val);
|
|
Calendar cal = Calendar.getInstance();
|
|
cal.setTimeInMillis(System.currentTimeMillis());
|
|
cal.add(Calendar.SECOND, delta);
|
|
expires = cal.getTime();
|
|
}
|
|
else if ("Expires".equalsIgnoreCase(attr))
|
|
{
|
|
DateFormat dateFormat = new HTTPDateFormat();
|
|
try
|
|
{
|
|
expires = dateFormat.parse(val);
|
|
}
|
|
catch (ParseException e)
|
|
{
|
|
// if this isn't a valid date, it may be that
|
|
// the value was returned unquoted; in that case, we
|
|
// want to continue buffering the value
|
|
buf.append(c);
|
|
continue;
|
|
}
|
|
}
|
|
attr = null;
|
|
buf.setLength(0);
|
|
// case EOL
|
|
if (i == len || c == ',')
|
|
{
|
|
Cookie cookie = new Cookie(name, value, comment, domain,
|
|
path, secure, expires);
|
|
cookieManager.setCookie(cookie);
|
|
}
|
|
if (c == ',')
|
|
{
|
|
// Reset cookie fields
|
|
name = null;
|
|
value = null;
|
|
comment = null;
|
|
domain = connection.getHostName();
|
|
path = this.path;
|
|
if (lsi != -1)
|
|
{
|
|
path = path.substring(0, lsi);
|
|
}
|
|
secure = false;
|
|
expires = null;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
buf.append(c);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
buf.append(c);
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|