On Thu, Oct 5, 2017 at 12:08 PM, Oleg Kalnichevski <[email protected]> wrote:
> On Thu, 2017-10-05 at 17:55 +0000, [email protected] wrote: > > Repository: httpcomponents-core > > Updated Branches: > > refs/heads/4.4.x 6a16ab53b -> 050f0fcf8 > > > > > > [HTTPCORE-494] Add image constants to ContentType. > > > > Hi Gary > > Was it a good idea to commit stuff to an active release branch? > > Could not it all wait until after the release completion? > I guess not. But I suppose a branch could be used for release tweaks is needed. Gary > > Oleg > > > > Project: http://git-wip-us.apache.org/repos/asf/httpcomponents- > > core/repo > > Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/co > > mmit/050f0fcf > > Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree > > /050f0fcf > > Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff > > /050f0fcf > > > > Branch: refs/heads/4.4.x > > Commit: 050f0fcf8f0703950f3a2cf47a4a9b4ac4e6aa6c > > Parents: 6a16ab5 > > Author: Gary Gregory <[email protected]> > > Authored: Thu Oct 5 11:55:49 2017 -0600 > > Committer: Gary Gregory <[email protected]> > > Committed: Thu Oct 5 11:55:49 2017 -0600 > > > > ------------------------------------------------------------------- > > --- > > RELEASE_NOTES.txt | 14 > > +++++++++++++- > > .../java/org/apache/http/entity/ContentType.java | 15 > > +++++++++++++++ > > 2 files changed, 28 insertions(+), 1 deletion(-) > > ------------------------------------------------------------------- > > --- > > > > > > http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/050f0 > > fcf/RELEASE_NOTES.txt > > ------------------------------------------------------------------- > > --- > > diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt > > index eb5f71f..db6d1a1 100644 > > --- a/RELEASE_NOTES.txt > > +++ b/RELEASE_NOTES.txt > > @@ -1,7 +1,19 @@ > > +Release 4.4.9 > > +------------------- > > + > > +This is a maintenance release that fixes a number of issues > > discovered since 4.4.8. > > + > > +Changelog > > +------------------- > > + > > +* HTTPCORE-494: Add image constants to ContentType. > > + Contributed by Gary Gregory <ggregory at apache.org> > > + > > + > > Release 4.4.8 > > ------------------- > > > > -This is a maintenance release that fixes a number of issues > > discovered since 4.4.6. > > +This is a maintenance release that fixes a number of issues > > discovered since 4.4.7. > > > > Changelog > > ------------------- > > > > http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/050f0 > > fcf/httpcore/src/main/java/org/apache/http/entity/ContentType.java > > ------------------------------------------------------------------- > > --- > > diff --git > > a/httpcore/src/main/java/org/apache/http/entity/ContentType.java > > b/httpcore/src/main/java/org/apache/http/entity/ContentType.java > > index 4491e56..874a095 100644 > > --- a/httpcore/src/main/java/org/apache/http/entity/ContentType.java > > +++ b/httpcore/src/main/java/org/apache/http/entity/ContentType.java > > @@ -83,6 +83,16 @@ public final class ContentType implements > > Serializable { > > "application/xhtml+xml", Consts.ISO_8859_1); > > public static final ContentType APPLICATION_XML = create( > > "application/xml", Consts.ISO_8859_1); > > + public static final ContentType IMAGE_BMP = create( > > + "image/bmp"); > > + public static final ContentType IMAGE_GIF= create( > > + "image/gif"); > > + public static final ContentType IMAGE_JPEG = create( > > + "image/jpeg"); > > + public static final ContentType IMAGE_PNG = create( > > + "image/png"); > > + public static final ContentType IMAGE_WEBP = create( > > + "image/webp"); > > public static final ContentType MULTIPART_FORM_DATA = create( > > "multipart/form-data", Consts.ISO_8859_1); > > public static final ContentType TEXT_HTML = create( > > @@ -105,6 +115,11 @@ public final class ContentType implements > > Serializable { > > APPLICATION_SVG_XML, > > APPLICATION_XHTML_XML, > > APPLICATION_XML, > > + IMAGE_BMP, > > + IMAGE_GIF, > > + IMAGE_JPEG, > > + IMAGE_PNG, > > + IMAGE_WEBP, > > MULTIPART_FORM_DATA, > > TEXT_HTML, > > TEXT_PLAIN, > > >
