summaryrefslogtreecommitdiff
path: root/sapi/apache2handler
Commit message (Collapse)AuthorAgeFilesLines
* Introduce zend_stream_init_filename()Nikita Popov2019-07-161-5/+1
| | | | Avoid more ad-hoc initialization of zend_file_handle structures.
* Remove some more Apache 1 left oversPeter Kokot2019-07-071-6/+4
| | | | | - warning in configure.ac is relevant for the sapi/apache - errors output redirected to /dev/null when checking Apache version
* Use PHP_VERSION for zend modulesPeter Kokot2019-06-091-1/+1
| | | | Closes #4147
* Normalize comments in *nix build system m4 filesPeter Kokot2019-05-121-8/+5
| | | | | | | | | Normalization include: - Use dnl for everything that can be ommitted when configure is built in favor of the shell comment character # which is visible in the output. - Line length normalized to 80 columns - Dots for most of the one line sentences - Macro definitions include similar pattern header comments now
* [ci skip] Remove outdated and redundant Apache READMEPeter Kokot2019-04-281-75/+0
| | | | | PHP manual includes more information and a bit more updated than this README.
* Implemented a faster way to access predefined TSRM resources - CG(), EG(), etc.Dmitry Stogov2019-03-141-2/+1
|
* Avoid reinitailization of ZTS cache pointer. Initialize it once in TSRM.cDmitry Stogov2019-03-121-0/+4
|
* Add AS_HELP_STRING to *nix build configure optionsPeter Kokot2019-03-071-3/+6
| | | | | | | | The Autoconf's default AS_HELP_STRING macro can properly format help strings [1] so watching out if columns are aligned manually is not anymore. [1] https://www.gnu.org/software/autoconf/manual/autoconf.html#Pretty-Help-Strings
* Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-02-221-1/+1
|\ | | | | | | | | * PHP-7.3: Fix #77648: BOM in sapi/apache2handler/php_functions.c
| * Fix #77648: BOM in sapi/apache2handler/php_functions.cChristoph M. Becker2019-02-221-1/+1
| |
| * Sync leading and final newlines in source code filesPeter Kokot2018-10-142-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| * Trim trailing whitespace in source code filesPeter Kokot2018-10-131-11/+11
| |
* | Remove local variablesPeter Kokot2019-02-035-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes the so called local variables defined per file basis for certain editors to properly show tab width, and similar settings. These are mainly used by Vim and Emacs editors yet with recent changes the once working definitions don't work anymore in Vim without custom plugins or additional configuration. Neither are these settings synced across the PHP code base. A simpler and better approach is EditorConfig and fixing code using some code style fixing tools in the future instead. This patch also removes the so called modelines for Vim. Modelines allow Vim editor specifically to set some editor configuration such as syntax highlighting, indentation style and tab width to be set in the first line or the last 5 lines per file basis. Since the php test files have syntax highlighting already set in most editors properly and EditorConfig takes care of the indentation settings, this patch removes these as well for the Vim 6.0 and newer versions. With the removal of local variables for certain editors such as Emacs and Vim, the footer is also probably not needed anymore when creating extensions using ext_skel.php script. Additionally, Vim modelines for setting php syntax and some editor settings has been removed from some *.phpt files. All these are mostly not relevant for phpt files neither work properly in the middle of the file.
* | Remove yearly range from copyright noticeZeev Suraski2019-01-305-5/+5
| |
* | Stop Apache if PHP wasn't started successful.Dmitry Stogov2018-10-291-1/+3
| |
* | Sync leading and final newlines in source code filesPeter Kokot2018-10-142-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
* | Trim trailing whitespace in source code filesPeter Kokot2018-10-131-11/+11
|/
* Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2018-09-301-1/+8
|\
| * Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-09-301-1/+8
| |\
| | * Fixed bug #75479Nikita Popov2018-09-301-1/+8
| | | | | | | | | | | | Wrap the zend_signal_init() call, so the hook arguments line up.
* | | Merge branch 'PHP-7.2' into PHP-7.3Stanislav Malyshev2018-09-091-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.2: Update NEWS Fix for bug #76582
| * | Merge branch 'PHP-7.1' into PHP-7.2Stanislav Malyshev2018-09-091-0/+1
| |\ \ | | |/ | | | | | | | | | | | | * PHP-7.1: Update NEWS Fix for bug #76582
| | * Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2018-09-091-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | * PHP-7.0: Update NEWS Fix for bug #76582
| | | * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2018-09-091-0/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Update NEWS Fix for bug #76582
| | | | * Fix for bug #76582Stanislav Malyshev2018-09-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The brigade seems to end up in a messed up state if something fails in shutdown, so we clean it up.
| | * | | Fix race conditions with Apache vhost vs. per dir configAnatol Belski2018-02-011-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the same php_value/php_flag is present in httpd.conf and .htaccess, the key is potentially shared between threads. Unfortunately we can't intern these keys using the current mechanism, because the MPM is setup before the SAPI module setup is even started. A more elegant way were to implement a kind of string pool for the thread safe Apache SAPI config directives with the mechanism similar to what is done for the SAPI setup now, but doing a separate management. (cherry picked from commit 73eb5a78b9caa18d35624765f9b972c1ba48855d)
| | * | | year++Xinchen Hui2018-01-025-5/+5
| | | | |
* | | | | Trim trailing whitespaces in build filesPeter Kokot2018-07-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some editors utilizing .editorconfig automatically trim whitespaces. For convenience this patch removes whitespaces in certain build files: - ext/*/config*.m4 - configure.ac - acinclude.m4
* | | | | Remove unused Git attributes identPeter Kokot2018-07-257-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $Id$ keywords were used in Subversion where they can be substituted with filename, last revision number change, last changed date, and last user who changed it. In Git this functionality is different and can be done with Git attribute ident. These need to be defined manually for each file in the .gitattributes file and are afterwards replaced with 40-character hexadecimal blob object name which is based only on the particular file contents. This patch simplifies handling of $Id$ keywords by removing them since they are not used anymore.
* | | | | Merge branch 'PHP-7.2'Anatol Belski2018-01-311-0/+18
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-7.2: Fix race conditions with Apache vhost vs. per dir config
| * | | | Fix race conditions with Apache vhost vs. per dir configAnatol Belski2018-01-311-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the same php_value/php_flag is present in httpd.conf and .htaccess, the key is potentially shared between threads. Unfortunately we can't intern these keys using the current mechanism, because the MPM is setup before the SAPI module setup is even started. A more elegant way were to implement a kind of string pool for the thread safe Apache SAPI config directives with the mechanism similar to what is done for the SAPI setup now, but doing a separate management.
| * | | | year++Xinchen Hui2018-01-025-5/+5
| | | | |
* | | | | Use PHP_WIN32Kalle Sommer Nielsen2018-01-041-7/+7
| | | | |
* | | | | year++Xinchen Hui2018-01-025-5/+5
| | | | |
* | | | | Merge branch 'PHP-7.2'Anatol Belski2017-11-301-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-7.2: Revert "Fix macro redefinition warnings"
| * | | | Revert "Fix macro redefinition warnings"Anatol Belski2017-11-301-1/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 23d2bd374838897ec97f9994e70856686a89f132.
* | | | | Merge branch 'PHP-7.2'Anatol Belski2017-11-301-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * PHP-7.2: Fix macro redefinition warnings
| * | | | Fix macro redefinition warningsAnatol Belski2017-11-301-0/+1
| | | | | | | | | | | | | | | | | | | | The corresponding implementations are available from APR.
* | | | | Merge branch 'PHP-7.2'Nikita Popov2017-10-051-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2017-10-051-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-10-051-2/+2
| | |\ \ \ | | | |/ /
| | | * | Fixed bug #75311Mathieu CARBONNEAUX2017-10-051-2/+2
| | | | |
* | | | | Removed support for BeOS, development for BeOS was supported 17 years ago.Kalle Sommer Nielsen2017-08-291-7/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | This patch however does not drop support for the BeOS compatible variant, Haiku, see Github PR #2697 which is currently a WiP I intentionally left out some fragments for BeOS in the build system for that seems to be bundles
* | | | Merge branch 'PHP-7.1'Anatol Belski2017-03-282-47/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-7.1: update NEWS update NEWS Revert "Fixed bug #61471"
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-03-282-47/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-7.0: update NEWS Revert "Fixed bug #61471"
| | * | Revert "Fixed bug #61471"Anatol Belski2017-03-282-47/+1
| | | | | | | | | | | | | | | | This reverts commit 80c8d84af303d2fddc9ba9f181c7117b9040811d.
* | | | Merge branch 'PHP-7.1'Nikita Popov2017-02-082-1/+47
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-02-082-1/+47
| |\ \ \ | | |/ /
| | * | Fixed bug #61471Zheng SHAO2017-02-082-1/+47
| | | |
| * | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-01-051-44/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.0: Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
View Lorry Controller Status