summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Sync leading and final newlines in source code filesPeter Kokot2018-10-14476-623/+129
| | | | | | | | | | | | | | | | | | | | | | 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
* Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-140-0/+0
|\ | | | | | | | | | | * PHP-7.2: Sync leading and final newlines in source code files Sync leading and final newlines in source code files
| * Sync leading and final newlines in source code filesPeter Kokot2018-10-14578-746/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-140-0/+0
| |\ | | | | | | | | | | | | * PHP-7.1: Sync leading and final newlines in source code files
| | * Sync leading and final newlines in source code filesPeter Kokot2018-10-14578-747/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'PHP-7.2' into PHP-7.3Frank Denis2018-10-142-7/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-7.2: ext/sodium: sodium_pad(): do not copy any bytes if the string is empty ext/sodium: Fix sodium_pad() with blocksize >= 256 ext/sodium: Use a correct max output size for base64 decoding ext/sodium: Avoid shifts wider than 32 bits on size_t values
| * | [ci skip] Update NEWSFrank Denis2018-10-141-0/+8
| | |
| * | ext/sodium: sodium_pad(): do not copy any bytes if the string is emptyFrank Denis2018-10-141-6/+11
| | | | | | | | | | | | | | | | | | Spotted by San Zhang, thanks! Backport from PECL libsodium-php 2.0.13
| * | ext/sodium: Fix sodium_pad() with blocksize >= 256Frank Denis2018-10-141-1/+2
| | | | | | | | | | | | Backport from PECL libsodium-php 2.0.12
| * | ext/sodium: Use a correct max output size for base64 decodingFrank Denis2018-10-142-1/+8
| | | | | | | | | | | | | | | | | | Also handle the case where the function is not available in test. Backport from PECL libsodium-php 2.0.12
| * | ext/sodium: Avoid shifts wider than 32 bits on size_t valuesFrank Denis2018-10-141-1/+2
| | | | | | | | | | | | Backport from PECL libsodium-php 2.0.10
* | | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-130-0/+0
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix failing tests/lang due to whitespace
| * | Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-132-69/+69
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix failing tests/lang due to whitespace
| | * Fix failing tests/lang due to whitespacePeter Kokot2018-10-132-69/+69
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-131-13/+13
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix failing ext/zlib/tests due to whitespace
| * | Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-131-13/+13
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix failing ext/zlib/tests due to whitespace
| | * Fix failing ext/zlib/tests due to whitespacePeter Kokot2018-10-131-13/+13
| | |
* | | Trim trailing whitespace in source code filesPeter Kokot2018-10-13137-2751/+2749
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-130-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.2: Trim trailing whitespace in source code files Trim trailing whitespace in source code files
| * | Trim trailing whitespace in source code filesPeter Kokot2018-10-13459-4812/+4810
| | |
| * | Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-130-0/+0
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Trim trailing whitespace in source code files
| | * Trim trailing whitespace in source code filesPeter Kokot2018-10-13458-4719/+4716
| | |
* | | Convert CRLF line endings to LFPeter Kokot2018-10-1317-838/+838
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
* | | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2018-10-130-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.2: Convert CRLF line endings to LF Convert CRLF line endings to LF
| * | Convert CRLF line endings to LFPeter Kokot2018-10-1314-684/+684
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
| * | Merge branch 'PHP-7.1' into PHP-7.2Peter Kokot2018-10-130-0/+0
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Convert CRLF line endings to LF
| | * Convert CRLF line endings to LFPeter Kokot2018-10-13210-12159/+12159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies line endings tracked in the Git repository and syncs them to all include the LF style instead of the CRLF files. Newline characters: - LF (\n) (*nix and Mac) - CRLF (\r\n) (Windows) - CR (\r) (old Mac, obsolete) To see which line endings are in the index and in the working copy the following command can be used: `git ls-files --eol` Git additionally provides `.gitattributes` file to specify if some files need to have specific line endings on all platforms (either CRLF or LF). Changed files shouldn't cause issues on modern Windows platforms because also Git can do output conversion is core.autocrlf=true is set on Windows and use CRLF newlines in all files in the working tree. Unless CRLF files are tracked specifically, Git by default tracks all files in the index using LF newlines.
* | | Upgrade timelib to 2018.01RC1, to fix bug #77007Derick Rethans2018-10-129-144/+134
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Derick Rethans2018-10-120-0/+0
|\ \ \ | |/ /
| * | Upgrade timelib to 2017.08, to fix bug #77007Derick Rethans2018-10-125-67/+71
| | |
* | | Update news with further fixed bugs due to timelib upgradeDerick Rethans2018-10-111-2/+5
| | |
* | | Fixed bug #76991Nikita Popov2018-10-104-230/+276
| | | | | | | | | | | | | | | Back up exceptions while the scan-ahead loop, to avoid an early bail out.
* | | [ci skip] Update UPGRADING about Autoconf versionPeter Kokot2018-10-091-0/+1
| | |
* | | Bump minimum Autoconf requirement to 2.68Peter Kokot2018-10-093-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch syncs and bumps the minimum required version of Autoconf for the `phpize.m4` script and the main `configure.ac` from previously mixed 2.64 and 2.59 to 2.68. At the time of this writing Autoconf 2.63 is still the version on Centos 6, however by the PHP 7.3 release current systems out there should all have pretty much updated Autoconf versions to 2.64+ at least. Centos 7 already has Autoconf 2.69, for example. This provides more options to update and get current with the *nix build system and also avoids broken builds in certain cases as pointed out in the relevant discussion [1]. Additionally, phpize also already provides the `AX_CHECK_COMPILE_FLAG` Autoconf Archive m4 file that has Autoconf 2.64 minimum requirement. Autoconf 2.68 was released in 2010, 8 years ago, relative to this patch. [1] https://github.com/php/php-src/pull/3562
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-10-093-1/+45
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #30875: xml_parse_into_struct() does not resolve entities
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-10-093-1/+45
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #30875: xml_parse_into_struct() does not resolve entities
| | * Fix #30875: xml_parse_into_struct() does not resolve entitiesChristoph M. Becker2018-10-093-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting up an empty default handler is not only useless, but actually harmful, since internal entity-references are not resolved anymore. From the libexpat docs[1]: | Setting the handler with this call has the side effect of | turning off expansion of references to internally defined general | entities. Instead these references are passed to the default | handler. [1] <https://www.xml.com/pub/1999/09/expat/reference.html#setdefhandler>
* | | [ci skip] Update NEWSChristoph M. Becker2018-10-091-0/+3
| | |
* | | Fixed testsDerick Rethans2018-10-092-3/+3
| | |
* | | Added test case for bug #75577Derick Rethans2018-10-091-0/+22
| | |
* | | Fixed bug #75577: DateTime::createFromFormat does not accept 'v' format ↵Derick Rethans2018-10-098-341/+812
| | | | | | | | | | | | specifier, by updating timelib to 2018.01alpha2
* | | [ci skip] Update NEWS wrt. php-7.3.0RC3 taggingChristoph M. Becker2018-10-091-1/+4
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Pierrick Charron2018-10-094-56/+108
|\ \ \ | |/ /
| * | Merge branch 'PHP-7.1' into PHP-7.2Pierrick Charron2018-10-094-86/+140
| |\ \ | | |/
| | * Fixed bug #76965 INI_SCANNER_RAW doesn't strip trailing whitespacePierrick Charron2018-10-094-86/+140
| | |
* | | Add constants from curl 7.56 to 7.61Pierrick Charron2018-10-084-3/+167
| | |
* | | Fix ref ID handling when serializing $GLOBALSNikita Popov2018-10-082-3/+25
| | | | | | | | | | | | | | | This was already broken previously, but in PHP 7.3 stricter validation during unserialization made this into an error.
* | | [ci skip] Note the required configure changes for bundled libzipChristoph M. Becker2018-10-081-0/+4
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2018-10-083-2/+52
|\ \ \ | |/ / | | | | | | | | | * PHP-7.2: Fix #76954: apache_response_headers removes last character from header name
| * | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-10-083-2/+52
| |\ \ | | |/ | | | | | | | | | * PHP-7.1: Fix #76954: apache_response_headers removes last character from header name