Skip to content

Commit

Permalink
Merge pull request #2336 from KapilSachdev/fix/use_https_in_links
Browse files Browse the repository at this point in the history
fix: Update links to use TLS/SSL [ci skip] [changelog skip]
  • Loading branch information
nateberkopec committed Aug 21, 2020
2 parents 0f718d5 + 2ffcf56 commit b981e97
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -8,7 +8,7 @@

[![Code Climate](https://codeclimate.com/github/puma/puma.svg)](https://codeclimate.com/github/puma/puma)
[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=puma&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=puma&package-manager=bundler&version-scheme=semver)
[![StackOverflow](http://img.shields.io/badge/stackoverflow-Puma-blue.svg)]( http://stackoverflow.com/questions/tagged/puma )
[![StackOverflow](https://img.shields.io/badge/stackoverflow-Puma-blue.svg)]( https://stackoverflow.com/questions/tagged/puma )

Puma is a **simple, fast, multi-threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications**.

Expand All @@ -27,7 +27,7 @@ $ gem install puma
$ puma
```

Without arguments, puma will look for a rackup (.ru) file in
Without arguments, puma will look for a rackup (.ru) file in
working directory called `config.ru`.

## Frameworks
Expand Down Expand Up @@ -135,7 +135,7 @@ Preloading can’t be used with phased restart, since phased restart kills and r
If puma encounters an error outside of the context of your application, it will respond with a 500 and a simple
textual error message (see `lowlevel_error` in [this file](https://github.com/puma/puma/blob/master/lib/puma/server.rb)).
You can specify custom behavior for this scenario. For example, you can report the error to your third-party
error-tracking service (in this example, [rollbar](http://rollbar.com)):
error-tracking service (in this example, [rollbar](https://rollbar.com)):

```ruby
lowlevel_error_handler do |e|
Expand Down
6 changes: 3 additions & 3 deletions docs/architecture.md
Expand Up @@ -2,7 +2,7 @@

## Overview

![http://bit.ly/2iJuFky](images/puma-general-arch.png)
![https://bit.ly/2iJuFky](images/puma-general-arch.png)

Puma is a threaded web server, processing requests across a TCP or UNIX socket.

Expand All @@ -12,7 +12,7 @@ Clustered mode is shown/discussed here. Single mode is analogous to having a sin

## Connection pipeline

![http://bit.ly/2zwzhEK](images/puma-connection-flow.png)
![https://bit.ly/2zwzhEK](images/puma-connection-flow.png)

* Upon startup, Puma listens on a TCP or UNIX socket.
* The backlog of this socket is configured (with a default of 1024), determining how many established but unaccepted connections can exist concurrently.
Expand All @@ -29,7 +29,7 @@ Clustered mode is shown/discussed here. Single mode is analogous to having a sin

### Disabling `queue_requests`

![http://bit.ly/2zxCJ1Z](images/puma-connection-flow-no-reactor.png)
![https://bit.ly/2zxCJ1Z](images/puma-connection-flow-no-reactor.png)

The `queue_requests` option is `true` by default, enabling the separate thread used to buffer requests as described above.

Expand Down
8 changes: 4 additions & 4 deletions docs/signals.md
@@ -1,8 +1,8 @@
The [unix signal](http://en.wikipedia.org/wiki/Unix_signal) is a method of sending messages between [processes](http://en.wikipedia.org/wiki/Process_(computing)). When a signal is sent, the operating system interrupts the target process's normal flow of execution. There are standard signals that are used to stop a process but there are also custom signals that can be used for other purposes. This document is an attempt to list all supported signals that Puma will respond to. In general, signals need only be sent to the master process of a cluster.
The [unix signal](https://en.wikipedia.org/wiki/Unix_signal) is a method of sending messages between [processes](https://en.wikipedia.org/wiki/Process_(computing)). When a signal is sent, the operating system interrupts the target process's normal flow of execution. There are standard signals that are used to stop a process but there are also custom signals that can be used for other purposes. This document is an attempt to list all supported signals that Puma will respond to. In general, signals need only be sent to the master process of a cluster.

## Sending Signals

If you are new to signals it can be useful to see how they can be used. When a process is created in a *nix like operating system it will have a [PID - or process identifier](http://en.wikipedia.org/wiki/Process_identifier) that can be used to send signals to the process. For demonstration we will create an infinitely running process by tailing a file:
If you are new to signals it can be useful to see how they can be used. When a process is created in a *nix like operating system it will have a [PID - or process identifier](https://en.wikipedia.org/wiki/Process_identifier) that can be used to send signals to the process. For demonstration we will create an infinitely running process by tailing a file:

```sh
$ echo "foo" >> my.log
Expand All @@ -17,13 +17,13 @@ $ ps aux | grep tail
schneems 87152 0.0 0.0 2432772 492 s032 S+ 12:46PM 0:00.00 tail -f my.log
```

You can send a signal in Ruby using the [Process module](http://www.ruby-doc.org/core-2.1.1/Process.html#kill-method):
You can send a signal in Ruby using the [Process module](https://www.ruby-doc.org/core-2.1.1/Process.html#kill-method):

```
$ irb
> puts pid
=> 87152
Process.detach(pid) # http://ruby-doc.org/core-2.1.1/Process.html#method-c-detach
Process.detach(pid) # https://ruby-doc.org/core-2.1.1/Process.html#method-c-detach
Process.kill("TERM", pid)
```

Expand Down
4 changes: 2 additions & 2 deletions lib/puma/commonlogger.rb
Expand Up @@ -3,7 +3,7 @@
module Puma
# Rack::CommonLogger forwards every request to the given +app+, and
# logs a line in the
# {Apache common log format}[http://httpd.apache.org/docs/1.3/logs.html#common]
# {Apache common log format}[https://httpd.apache.org/docs/1.3/logs.html#common]
# to the +logger+.
#
# If +logger+ is nil, CommonLogger will fall back +rack.errors+, which is
Expand All @@ -16,7 +16,7 @@ module Puma
# (which is called without arguments in order to make the error appear for
# sure)
class CommonLogger
# Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common
# Common Log Format: https://httpd.apache.org/docs/1.3/logs.html#common
#
# lilith.local - - [07/Aug/2006 23:58:02 -0400] "GET / HTTP/1.1" 500 -
#
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/server.rb
Expand Up @@ -474,7 +474,7 @@ def normalize_env(env, client)

env[PATH_INFO] = env[REQUEST_PATH]

# From http://www.ietf.org/rfc/rfc3875 :
# From https://www.ietf.org/rfc/rfc3875 :
# "Script authors should be aware that the REMOTE_ADDR and
# REMOTE_HOST meta-variables (see sections 4.1.8 and 4.1.9)
# may not identify the ultimate source of the request.
Expand Down
4 changes: 2 additions & 2 deletions puma.gemspec
Expand Up @@ -15,13 +15,13 @@ Gem::Specification.new do |s|
end
s.files = `git ls-files -- bin docs ext lib tools`.split("\n") +
%w[History.md LICENSE README.md]
s.homepage = "http://puma.io"
s.homepage = "https://puma.io"

if s.respond_to?(:metadata=)
s.metadata = {
"bug_tracker_uri" => "https://github.com/puma/puma/issues",
"changelog_uri" => "https://github.com/puma/puma/blob/master/History.md",
"homepage_uri" => "http://puma.io",
"homepage_uri" => "https://puma.io",
"source_code_uri" => "https://github.com/puma/puma"
}
end
Expand Down

0 comments on commit b981e97

Please sign in to comment.