Skip to content

Commit 0bffdd7

Browse files
author
Jerome Loyet
committed
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (367 commits) fix unix/win dir separators Fix bug #63173: Crash when invoking invalid array callback Correct the test summary Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo) Avoid calling select if maxfd returned by curl_multi_fdset is -1 Fixing NEWS file Fixed bug #63111 (is_callable() lies for abstract static method) updated lib versions Fix folding fix bug #63015 (Incorrect arginfo for DOMErrorHandler) Bug #63000: MCAST_JOIN_GROUP on OSX is broken Fixed bug #61442 (exception threw in __autoload can not be catched) Merging PR #116 Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver updated libary versions split tests for the new zlib version on win Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken) update news Support building PHP with the native client toolchain. ...
2 parents 1fa8ecd + 6a50a86 commit 0bffdd7

File tree

651 files changed

+10606
-26168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

651 files changed

+10606
-26168
lines changed

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ ext/dba/libflatfile/flatfile.c ident
1515
ext/dba/libcdb/cdb_make.c ident
1616
ext/dba/libcdb/cdb.c ident
1717
ext/filter/filter.c ident
18+
ext/zip/php_zip.c ident
1819
README.input_filter ident
1920
run-tests.php ident
2021
sapi/nsapi/nsapi.c ident

‎.travis.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: php
2+
3+
php:
4+
# We only specify one version so we only get one worker
5+
- 5.4
6+
7+
notifications:
8+
email: false
9+
10+
script: exit 0

‎CODING_STANDARDS

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
PHP Coding Standards
33
========================
44

5-
This file lists several standards that any programmer, adding or changing
6-
code in PHP, should follow. Since this file was added at a very late
5+
This file lists several standards that any programmer adding or changing
6+
code in PHP should follow. Since this file was added at a very late
77
stage of the development of PHP v3.0, the code base does not (yet) fully
88
follow it, but it's going in that general direction. Since we are now
9-
well into the version 4 releases, many sections have been recoded to use
9+
well into version 5 releases, many sections have been recoded to use
1010
these rules.
1111

1212
Code Implementation

‎INSTALL

+128-74
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)