diff options
| author | Juuso Lapinlampi <wub@partyvan.eu> | 2016-05-25 06:58:24 +0200 |
|---|---|---|
| committer | Juuso Lapinlampi <wub@partyvan.eu> | 2016-05-25 06:58:24 +0200 |
| commit | 18ca9ae7c36b23e848293088ee3f8f423da8121e (patch) | |
| tree | d349099d8b6c314333953383c8732b86ec0c0184 | |
| parent | 8b23ebc05eba911e0c885e38b4f05d2e42e6be04 (diff) | |
| parent | 212dc87c10fe1f667e38637c9287cad3ce84e934 (diff) | |
Merge branch 'wub/deprecate-ob_start'
- upload.php: Deprecate ob_start (output buffering)
- CHANGELOG: Update 2.1.0 up to f4504ac
Reviewed-by: Eliot Whalan <ewhal@pantsu.cat>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | static/upload.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cdc436..8c41b14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). `json_success`, `text_error` and `text_success` functions. The functions will be renamed to `camelCase` format (e.g. `csvError`, `htmlSuccess`). (Juuso Lapinlampi) +- Output buffering (`ob_start`). This feature may be removed in the next + major version. (Juuso Lapinlampi) ### Fixed diff --git a/static/upload.php b/static/upload.php index 8b0646c..ebedeab 100644 --- a/static/upload.php +++ b/static/upload.php @@ -30,6 +30,7 @@ */ // Check if we can compress our output; if we can, we'll do it +// This feature is deprecated since version 2.1.0. if (ini_get('zlib.output_compression') !== 'Off' && isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false) { |