diff options
| author | Anatol Belski <ab@php.net> | 2014-09-20 21:37:19 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-20 21:37:19 +0200 |
| commit | fb17d6516d65c870cd47354598f0daf5d17f1df7 (patch) | |
| tree | 00a84c3085bac850cf1960ebbca2c82efca03ae4 /sapi/apache/php.sym | |
| parent | b3aebda9eaf55706af2e21178f229a171725a168 (diff) | |
| parent | 2fc1a1dce557875d029f16d58bd3d4cd22af54fb (diff) | |
| download | php-git-fb17d6516d65c870cd47354598f0daf5d17f1df7.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fixed copying of the struct as it's not being modified
avoid strlen usage in loop
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'sapi/apache/php.sym')
| -rw-r--r-- | sapi/apache/php.sym | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/apache/php.sym b/sapi/apache/php.sym index 9ad0f0a0ad..1469b0314d 100644 --- a/sapi/apache/php.sym +++ b/sapi/apache/php.sym @@ -1 +1 @@ -php5_module +php7_module |