Skip to content

Commit

Permalink
Use https URLs in the documentation when possible
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1834077 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
ebourg committed Jun 22, 2018
1 parent 23d0d83 commit 06fa776
Show file tree
Hide file tree
Showing 120 changed files with 282 additions and 282 deletions.
10 changes: 5 additions & 5 deletions BUILDING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a container that
implements the Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.1 specifications
from the Java Community Process <http://www.jcp.org/>.
from the Java Community Process <https://www.jcp.org/>.

Note: If you just need to run Apache Tomcat, it is not necessary to build
it. You may simply download a binary distribution. It is cross-platform.
Expand Down Expand Up @@ -56,7 +56,7 @@ source distribution, do the following:
See Apache Commons DBCP project web site for more details on
available versions of the library and its requirements,

http://commons.apache.org/dbcp/
https://commons.apache.org/dbcp/

3. Install the JDK according to the instructions included with the release.

Expand All @@ -71,7 +71,7 @@ source distribution, do the following:

2. Download a binary distribution of Ant from:

http://ant.apache.org/bindownload.cgi
https://ant.apache.org/bindownload.cgi

3. Unpack the binary distribution into a convenient location so that the
Ant release resides in its own directory (conventionally named
Expand Down Expand Up @@ -99,11 +99,11 @@ package.

* Tomcat SVN repository URL:

http://svn.apache.org/repos/asf/tomcat/tc@[email protected]/trunk/
https://svn.apache.org/repos/asf/tomcat/tc@[email protected]/trunk/

* Source packages can be downloaded from:

http://tomcat.apache.org/download-@[email protected]
https://tomcat.apache.org/download-@[email protected]

The location where the source has been placed will be further referred as
${tomcat.source}.
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ Firstly, thanks for your interest in contributing! I hope that this will be a
pleasant first experience for you, and that you will return to continue
contributing.

Please visit our [Get Involved page](http://tomcat.apache.org/getinvolved.html)
Please visit our [Get Involved page](https://tomcat.apache.org/getinvolved.html)
for more information on how to contribute.

## Code of Conduct

This project and everyone participating in it is governed by the Apache
software Foundation's
[Code of Conduct](http://www.apache.org/foundation/policies/conduct.html). By
[Code of Conduct](https://www.apache.org/foundation/policies/conduct.html). By
participating, you are expected to adhere to this code. If you are aware of
unacceptable behavior, please visit the
[Reporting Guidelines page](http://www.apache.org/foundation/policies/conduct.html#reporting-guidelines)
[Reporting Guidelines page](https://www.apache.org/foundation/policies/conduct.html#reporting-guidelines)
and follow the instructions there.

## How Can I Contribute?
Expand All @@ -25,7 +25,7 @@ for us to fix.

### Reporting Bugs

Please review our [guide](http://tomcat.apache.org/bugreport.html) on how to
Please review our [guide](https://tomcat.apache.org/bugreport.html) on how to
submit a bug report. This page also has links to other resources to assist
you.

Expand All @@ -36,7 +36,7 @@ you.
Unsure where to begin contributing to Tomcat? You can start by taking a look at
the issues marked 'Beginner', link below. Please note that the Beginner keyword
is pretty new to the project, so if there aren't any issues in the filter feel
free to ask on the [dev list](http://tomcat.apache.org/lists.html#tomcat-dev).
free to ask on the [dev list](https://tomcat.apache.org/lists.html#tomcat-dev).

* [Beginner issues](https://bz.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&keywords=Beginner&keywords_type=allwords&list_id=160824&product=Tomcat%207&product=Tomcat%208&product=Tomcat%209&query_format=advanced) -
issues which should only require a few lines of code, and a test or two to
Expand Down Expand Up @@ -84,7 +84,7 @@ can download the sources from the "Source Code Distributions" section of the
If you have chosen to attach a patch to the Bugzilla issue (or email
one), then you'll need to checkout the SVN version. Instructions for new
committers to learn how to do this are found
[here](http://www.apache.org/dev/contributors.html#svnbasics). However, in the
[here](https://www.apache.org/dev/contributors.html#svnbasics). However, in the
interest of a fast ramp up, the short version is below. Note that the root of
the SVN repository is
[tomcat/trunk](http://svn.apache.org/repos/asf/tomcat/trunk),
Expand Down
4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Apache Tomcat
Copyright 1999-2018 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
The Apache Software Foundation (https://www.apache.org/).

The Windows Installer is built with the Nullsoft
Scriptable Install System (NSIS), which is
Expand All @@ -13,7 +13,7 @@ http://nsis.sourceforge.net.
Java compilation software for JSP pages is provided by the Eclipse
JDT Core Batch Compiler component, which is open source software.
The original software and related information is available at
http://www.eclipse.org/jdt/core/.
https://www.eclipse.org/jdt/core/.

For the bayeux implementation
The org.apache.cometd.bayeux API is derivative work originating at the Dojo Foundation
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ The Apache Tomcat® software is an open source implementation of the Java
Servlet, JavaServer Pages, Java Expression Language and Java WebSocket
technologies. The Java Servlet, JavaServer Pages, Java Expression Language and
Java WebSocket specifications are developed under the
[Java Community Process](http://jcp.org/en/introduction/overview).
[Java Community Process](https://jcp.org/en/introduction/overview).

The Apache Tomcat software is developed in an open and participatory
environment and released under the
[Apache License version 2](http://www.apache.org/licenses/). The Apache Tomcat
[Apache License version 2](https://www.apache.org/licenses/). The Apache Tomcat
project is intended to be a collaboration of the best-of-breed developers from
around the world. We invite you to participate in this open development
project. To learn more about getting involved,
[click here](http://tomcat.apache.org/getinvolved.html) or keep reading.
[click here](https://tomcat.apache.org/getinvolved.html) or keep reading.

Apache Tomcat software powers numerous large-scale, mission-critical web
applications across a diverse range of industries and organizations. Some of
these users and their stories are listed on the
[PoweredBy wiki page](http://wiki.apache.org/tomcat/PoweredBy).
[PoweredBy wiki page](https://wiki.apache.org/tomcat/PoweredBy).

Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
project logo are trademarks of the Apache Software Foundation.
Expand All @@ -34,7 +34,7 @@ The documentation available as of the date of this release is
included in the docs webapp which ships with tomcat. You can access that webapp
by starting tomcat and visiting http://localhost:8080/docs/ in your browser.
The most up-to-date documentation can be found at
http://tomcat.apache.org/tomcat-9.0-doc/.
https://tomcat.apache.org/tomcat-9.0-doc/.

### Installation

Expand All @@ -47,22 +47,22 @@ Please see [LICENSE](LICENSE) for more info.
### Support and Mailing List Information

* Free community support is available through the
[tomcat-users](http://tomcat.apache.org/lists.html#tomcat-users) email list and
a dedicated [IRC channel](http://tomcat.apache.org/irc.html) (#tomcat on
[tomcat-users](https://tomcat.apache.org/lists.html#tomcat-users) email list and
a dedicated [IRC channel](https://tomcat.apache.org/irc.html) (#tomcat on
Freenode).

* If you want freely available support for running Apache Tomcat, please see the
resources page [here](http://tomcat.apache.org/findhelp.html).
resources page [here](https://tomcat.apache.org/findhelp.html).

* If you want to be informed about new code releases, bug fixes,
security fixes, general news and information about Apache Tomcat, please
subscribe to the
[tomcat-announce](http://tomcat.apache.org/lists.html#tomcat-announce) email
[tomcat-announce](https://tomcat.apache.org/lists.html#tomcat-announce) email
list.

* If you have a concrete bug report for Apache Tomcat, please see the
instructions for reporting a bug
[here](http://tomcat.apache.org/bugreport.html).
[here](https://tomcat.apache.org/bugreport.html).

### Contributing

Expand Down
4 changes: 2 additions & 2 deletions RELEASE-NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ the check.
==============================
Viewing the Tomcat Change Log:
==============================
The full change log is available from http://tomcat.apache.org and is also
The full change log is available from https://tomcat.apache.org and is also
included in the documentation web application.


Expand Down Expand Up @@ -169,4 +169,4 @@ software:
When all else fails:
====================
See the FAQ
http://tomcat.apache.org/faq/
https://tomcat.apache.org/faq/
24 changes: 12 additions & 12 deletions RUNNING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Running With JRE 7 Or Later

(2.1) Download a binary distribution of Tomcat from:

http://tomcat.apache.org/
https://tomcat.apache.org/

(2.2) Unpack the binary distribution so that it resides in its own
directory (conventionally named "apache-tomcat-[version]").
Expand Down Expand Up @@ -203,7 +203,7 @@ launches Java directly and does not use the script files.
(4.3) Further information about configuring and running Tomcat can be found in
the documentation included here, as well as on the Tomcat web site:

http://tomcat.apache.org/
https://tomcat.apache.org/


(5) Shut Down Tomcat
Expand Down Expand Up @@ -394,32 +394,32 @@ For further reading:

* Documentation for APR/Native library in the Tomcat User's Guide

http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/apr.html
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/apr.html

* Documentation for the HTTP and AJP protocol connectors in the Tomcat
Configuration Reference

http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/http.html
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/http.html

http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/ajp.html
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/ajp.html

- Apache Tomcat Native project home

http://tomcat.apache.org/native-doc/
https://tomcat.apache.org/native-doc/

- Other projects

* OpenSSL

http://openssl.org/
https://www.openssl.org/

* Apache Portable Runtime

http://apr.apache.org/
https://apr.apache.org/

* Apache HTTP Server

http://httpd.apache.org/
https://httpd.apache.org/

To disable Apache Tomcat Native library:

Expand Down Expand Up @@ -450,17 +450,17 @@ For further reading:

- Apache Commons Daemon project

http://commons.apache.org/daemon/
https://commons.apache.org/daemon/

- Apache Tomcat documentation

* Installing Apache Tomcat

http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/setup.html
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/setup.html

* Windows service HOW-TO

http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/windows-service-howto.html
https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/windows-service-howto.html

The binary files of Apache Commons Daemon in Apache Tomcat distributions
for Windows are named:
Expand Down
2 changes: 1 addition & 1 deletion bin/service.bat
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ set "CLASSPATH=%CATALINA_HOME%\bin\bootstrap.jar;%CATALINA_BASE%\bin\tomcat-juli
if not "%CATALINA_HOME%" == "%CATALINA_BASE%" set "CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\tomcat-juli.jar"

"%EXECUTABLE%" //IS//%SERVICE_NAME% ^
--Description "Apache Tomcat @VERSION@ Server - http://tomcat.apache.org/" ^
--Description "Apache Tomcat @VERSION@ Server - https://tomcat.apache.org/" ^
--DisplayName "%DISPLAYNAME%" ^
--Install "%EXECUTABLE%" ^
--LogPath "%CATALINA_BASE%\logs" ^
Expand Down
4 changes: 2 additions & 2 deletions build.properties.default
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false

base-apache.loc.1=http://www.apache.org/dyn/closer.lua?action=download&filename=
base-apache.loc.2=http://archive.apache.org/dist
base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download&filename=
base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
base-tomcat.loc.1=${base-apache.loc.1}/tomcat
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2058,7 +2058,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
<link href="../elapi"/>
<link href="../websocketapi"/>
<link href="http://docs.oracle.com/javase/7/docs/api/"/>
<link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
<link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
<link href="http://docs.oracle.com/javaee/7/api/"/>
<sourcepath>
<path location="${tomcat.dist}/src/java"/>
Expand Down
4 changes: 2 additions & 2 deletions java/org/apache/catalina/ant/jmx/package.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<em>Ant (version 1.6 or later)</em> that can be used to interact with the
Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations
and query for Mbeans inside a running instance of Tomcat. For more information, see
<a href="http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html">
http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html</a>.</p>
<a href="https://tomcat.apache.org/tomcat-7.0-doc/monitoring.html">
https://tomcat.apache.org/tomcat-7.0-doc/monitoring.html</a>.</p>

<p>Each task element can open a new jmx connection or reference an
existing one. The following attribute are exists in every tasks:</p>
Expand Down
4 changes: 2 additions & 2 deletions java/org/apache/catalina/ant/package.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<em>Ant (version 1.6.x or later)</em> that can be used to interact with the
Manager application to deploy, undeploy, list, reload, start and stop web applications
from a running instance of Tomcat. For more information, see
<a href="http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html">
http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html</a>.</p>
<a href="https://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html">
https://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html</a>.</p>

<p>The attributes of each task element correspond
exactly to the request parameters that are included with an HTTP request
Expand Down
2 changes: 1 addition & 1 deletion java/org/apache/catalina/core/StandardWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ public synchronized Servlet loadServlet() throws ServletException {
unavailable(null);

// Added extra log statement for Bugzilla 36630:
// http://bz.apache.org/bugzilla/show_bug.cgi?id=36630
// https://bz.apache.org/bugzilla/show_bug.cgi?id=36630
if(log.isDebugEnabled()) {
log.debug(sm.getString("standardWrapper.instantiate", servletClass), e);
}
Expand Down
6 changes: 3 additions & 3 deletions java/org/apache/catalina/filters/ExpiresFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
/**
* <p>
* ExpiresFilter is a Java Servlet API port of <a
* href="http://httpd.apache.org/docs/2.2/mod/mod_expires.html">Apache
* href="https://httpd.apache.org/docs/2.2/mod/mod_expires.html">Apache
* mod_expires</a> to add '{@code Expires}' and
* '{@code Cache-Control: max-age=}' headers to HTTP response according to its
* '{@code Content-Type}'.
* </p>
*
* <p>
* Following documentation is inspired by <a
* href="http://httpd.apache.org/docs/2.2/mod/mod_expires.html">mod_expires</a>
* href="https://httpd.apache.org/docs/2.2/mod/mod_expires.html">mod_expires</a>
* </p>
* <h1>Summary</h1>
* <p>
Expand All @@ -75,7 +75,7 @@
* To modify {@code Cache-Control} directives other than {@code max-age} (see
* <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9" >RFC
* 2616 section 14.9</a>), you can use other servlet filters or <a
* href="http://httpd.apache.org/docs/2.2/mod/mod_headers.html" >Apache Httpd
* href="https://httpd.apache.org/docs/2.2/mod/mod_headers.html" >Apache Httpd
* mod_headers</a> module.
* </p>
* <h1>Filter Configuration</h1><h2>Basic configuration to add
Expand Down
4 changes: 2 additions & 2 deletions java/org/apache/catalina/filters/RemoteIpFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* </p>
* <p>
* Most of the design of this Servlet Filter is a port of <a
* href="http://httpd.apache.org/docs/trunk/mod/mod_remoteip.html">mod_remoteip</a>, this servlet filter replaces the apparent client remote
* href="https://httpd.apache.org/docs/trunk/mod/mod_remoteip.html">mod_remoteip</a>, this servlet filter replaces the apparent client remote
* IP address and hostname for the request with the IP address list presented by a proxy or a load balancer via a request headers (e.g.
* "X-Forwarded-For").
* </p>
Expand Down Expand Up @@ -169,7 +169,7 @@
* <strong>Regular expression vs. IP address blocks:</strong> <code>mod_remoteip</code> allows to use address blocks (e.g.
* <code>192.168/16</code>) to configure <code>RemoteIPInternalProxy</code> and <code>RemoteIPTrustedProxy</code> ; as the JVM doesn't have a
* library similar to <a
* href="http://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d">apr_ipsubnet_test</a>, we rely on
* href="https://apr.apache.org/docs/apr/1.3/group__apr__network__io.html#gb74d21b8898b7c40bf7fd07ad3eb993d">apr_ipsubnet_test</a>, we rely on
* regular expressions.
* </p>
* <hr>
Expand Down
4 changes: 2 additions & 2 deletions java/org/apache/catalina/manager/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ public class Constants {
"<table cellspacing=\"4\" border=\"0\">\n" +
" <tr>\n" +
" <td colspan=\"2\">\n" +
" <a href=\"http://tomcat.apache.org/\">\n" +
" <a href=\"https://tomcat.apache.org/\">\n" +
" <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n" +
" align=\"left\" src=\"{0}/images/tomcat.gif\">\n" +
" </a>\n" +
" <a href=\"http://www.apache.org/\">\n" +
" <a href=\"https://www.apache.org/\">\n" +
" <img border=\"0\" alt=\"The Apache Software Foundation\" align=\"right\"\n" +
" src=\"{0}/images/asf-logo.svg\" style=\"width: 266px; height: 83px;\">\n" +
" </a>\n" +
Expand Down
2 changes: 1 addition & 1 deletion java/org/apache/catalina/realm/JNDIRealm.java
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
* <p><strong>WARNING</strong> - There is a reported bug against the Netscape
* provider code (com.netscape.jndi.ldap.LdapContextFactory) with respect to
* successfully authenticated a non-existing user. The
* report is here: http://bz.apache.org/bugzilla/show_bug.cgi?id=11210 .
* report is here: https://bz.apache.org/bugzilla/show_bug.cgi?id=11210 .
* With luck, Netscape has updated their provider code and this is not an
* issue. </p>
*
Expand Down
2 changes: 1 addition & 1 deletion java/org/apache/catalina/servlets/CGIServlet.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
* or an instance where the specification cited differs from Best
* Community Practice (BCP).
* Such instances should be well-documented here. Please email the
* <a href="http://tomcat.apache.org/lists.html">Tomcat group</a>
* <a href="https://tomcat.apache.org/lists.html">Tomcat group</a>
* with amendments.
*
* </p>
Expand Down
Loading

0 comments on commit 06fa776

Please sign in to comment.