hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject [3/4] httpcomponents-client git commit: Line ending normalization
Date Mon, 29 May 2017 18:19:43 GMT
Line ending normalization


Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/ae6ff33d
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/ae6ff33d
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/ae6ff33d

Branch: refs/heads/4.6.x
Commit: ae6ff33dca1333e9fb48c510363d60523da68417
Parents: cb5a49b
Author: Oleg Kalnichevski <olegk@apache.org>
Authored: Mon May 29 20:15:07 2017 +0200
Committer: Oleg Kalnichevski <olegk@apache.org>
Committed: Mon May 29 20:15:07 2017 +0200

----------------------------------------------------------------------
 .gitattributes                                  |   23 +
 .../entity/DeflateInputStreamFactory.java       |  126 +-
 .../client/entity/GZIPInputStreamFactory.java   |  128 +-
 .../apache/http/conn/ssl/TrustAllStrategy.java  |   96 +-
 .../apache/http/impl/auth/CredSspScheme.java    | 2252 +++++++++---------
 .../http/impl/auth/CredSspSchemeFactory.java    |   88 +-
 .../org/apache/http/impl/auth/DebugUtil.java    |  192 +-
 7 files changed, 1464 insertions(+), 1441 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ae6ff33d/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..1e21b19
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.java   text diff=java
+*.html   text diff=html
+*.css    text
+*.js     text

http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ae6ff33d/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
b/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
index 3853efe..dfdefda 100644
--- a/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
+++ b/httpclient/src/main/java/org/apache/http/client/entity/DeflateInputStreamFactory.java
@@ -1,63 +1,63 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.http.client.entity;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.http.annotation.Contract;
-import org.apache.http.annotation.ThreadingBehavior;
-
-/**
- * {@link InputStreamFactory} for handling Deflate Content Coded responses.
- *
- * @since 4.5.4
- */
-@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class DeflateInputStreamFactory implements InputStreamFactory {
-
-    /**
-     * Singleton instance.
-     */
-    private static final DeflateInputStreamFactory INSTANCE = new DeflateInputStreamFactory();
-
-    /**
-     * Gets the singleton instance.
-     *
-     * @return the singleton instance.
-     */
-    public static DeflateInputStreamFactory getInstance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public InputStream create(final InputStream inputStream) throws IOException {
-        return new DeflateInputStream(inputStream);
-    }
-
-}
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.client.entity;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+
+/**
+ * {@link InputStreamFactory} for handling Deflate Content Coded responses.
+ *
+ * @since 4.5.4
+ */
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
+public class DeflateInputStreamFactory implements InputStreamFactory {
+
+    /**
+     * Singleton instance.
+     */
+    private static final DeflateInputStreamFactory INSTANCE = new DeflateInputStreamFactory();
+
+    /**
+     * Gets the singleton instance.
+     *
+     * @return the singleton instance.
+     */
+    public static DeflateInputStreamFactory getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public InputStream create(final InputStream inputStream) throws IOException {
+        return new DeflateInputStream(inputStream);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ae6ff33d/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
b/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
index f52fd12..787b937 100644
--- a/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
+++ b/httpclient/src/main/java/org/apache/http/client/entity/GZIPInputStreamFactory.java
@@ -1,64 +1,64 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-
-package org.apache.http.client.entity;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
-
-import org.apache.http.annotation.Contract;
-import org.apache.http.annotation.ThreadingBehavior;
-
-/**
- * {@link InputStreamFactory} for handling GZIPContent Coded responses.
- *
- * @since 4.5.4
- */
-@Contract(threading = ThreadingBehavior.IMMUTABLE)
-public class GZIPInputStreamFactory implements InputStreamFactory {
-
-    /**
-     * Singleton instance.
-     */
-    private static final GZIPInputStreamFactory INSTANCE = new GZIPInputStreamFactory();
-
-    /**
-     * Gets the singleton instance.
-     *
-     * @return the singleton instance.
-     */
-    public static GZIPInputStreamFactory getInstance() {
-        return INSTANCE;
-    }
-
-    @Override
-    public InputStream create(final InputStream inputStream) throws IOException {
-        return new GZIPInputStream(inputStream);
-    }
-
-}
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+
+package org.apache.http.client.entity;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+import org.apache.http.annotation.Contract;
+import org.apache.http.annotation.ThreadingBehavior;
+
+/**
+ * {@link InputStreamFactory} for handling GZIPContent Coded responses.
+ *
+ * @since 4.5.4
+ */
+@Contract(threading = ThreadingBehavior.IMMUTABLE)
+public class GZIPInputStreamFactory implements InputStreamFactory {
+
+    /**
+     * Singleton instance.
+     */
+    private static final GZIPInputStreamFactory INSTANCE = new GZIPInputStreamFactory();
+
+    /**
+     * Gets the singleton instance.
+     *
+     * @return the singleton instance.
+     */
+    public static GZIPInputStreamFactory getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public InputStream create(final InputStream inputStream) throws IOException {
+        return new GZIPInputStream(inputStream);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/ae6ff33d/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java
----------------------------------------------------------------------
diff --git a/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java b/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java
index d492404..3857f53 100644
--- a/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java
+++ b/httpclient/src/main/java/org/apache/http/conn/ssl/TrustAllStrategy.java
@@ -1,48 +1,48 @@
-/*
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */
-package org.apache.http.conn.ssl;
-
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
-/**
- * A trust strategy that accepts all certificates as trusted. Verification of
- * all other certificates is done by the trust manager configured in the SSL
- * context.
- *
- * @since 4.5.4
- */
-public class TrustAllStrategy implements TrustStrategy {
-
-    public static final TrustAllStrategy INSTANCE = new TrustAllStrategy();
-
-    @Override
-    public boolean isTrusted(final X509Certificate[] chain, final String authType) throws
CertificateException {
-        return true;
-    }
-
-}
+/*
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ */
+package org.apache.http.conn.ssl;
+
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+/**
+ * A trust strategy that accepts all certificates as trusted. Verification of
+ * all other certificates is done by the trust manager configured in the SSL
+ * context.
+ *
+ * @since 4.5.4
+ */
+public class TrustAllStrategy implements TrustStrategy {
+
+    public static final TrustAllStrategy INSTANCE = new TrustAllStrategy();
+
+    @Override
+    public boolean isTrusted(final X509Certificate[] chain, final String authType) throws
CertificateException {
+        return true;
+    }
+
+}


Mime
View raw message