summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | [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.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.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-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-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 2017.08, to fix bug #77007Derick Rethans2018-10-125-67/+71
| |
* | 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>
* | 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
| |
* | 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
| * Fix #76954: apache_response_headers removes last character from header namestodorovic2018-10-083-2/+52
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Christoph M. Becker2018-10-084-7/+60
|\ \ | |/ | | | | | | * PHP-7.1: Fix #75851: Year component overflow with date formats "c", "o", "r" and "y"
| * Fix #75851: Year component overflow with date formats "c", "o", "r" and "y"Adam Saponara2018-10-084-7/+60
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Pedro Magalhães2018-10-062-240/+0
|\ \ | |/ | | | | | | * PHP-7.1: Remove unstable dns tests
| * Remove unstable dns testsPedro Magalhães2018-10-062-240/+0
| |
* | Fix #76888 - Remove unstable testPedro Magalhães2018-10-061-42/+0
| |
* | [ci skip] Update NEWSAnatol Belski2018-10-051-0/+3
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-10-050-0/+0
|\ \ | |/ | | | | | | | | * PHP-7.1: [ci skip] Update NEWS Add test for bug #76942
| * [ci skip] Update NEWSAnatol Belski2018-10-051-0/+3
| |
| * Add test for bug #76942Anatol Belski2018-10-051-0/+33
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-10-053-0/+38
|\ \ | | | | | | | | | | | | | | | * PHP-7.1: Add test for bug #76942 Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
| * | Add test for bug #76942Anatol Belski2018-10-051-0/+33
| |/
| * Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCHAnatol Belski2018-10-052-0/+5
| | | | | | | | ref bug #74484
* | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-10-052-6/+69
|\ \ | |/
| * Fix #76972: FTP data truncation due to forceful ssl socket shutdownManuel Mausz2018-10-052-7/+71
| | | | | | | | Do a correct bidirectional shutdown instead
* | Update NEWS [ci skip]Anatol Belski2018-10-031-0/+3
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-10-030-0/+0
|\ \ | |/ | | | | | | * PHP-7.1: Update NEWS [ci skip]
| * Update NEWS [ci skip]Anatol Belski2018-10-031-0/+3
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-10-031-2/+2
|\ \ | |/ | | | | | | * PHP-7.1: Avoid code duplication and don't miss env restore
| * Avoid code duplication and don't miss env restoreAnatol Belski2018-10-031-2/+2
| |
* | bump zip extension versionRemi Collet2018-10-031-1/+1
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2018-10-031-1/+16
|\ \ | |/ | | | | | | * PHP-7.1: Fixed bug #76948 Failed shutdown/reboot or end session in Windows
| * Fixed bug #76948 Failed shutdown/reboot or end session in WindowsAnatol Belski2018-10-031-1/+16
| |
* | Merge branch 'PHP-7.1' into PHP-7.2Nikita Popov2018-10-031-7/+5
|\ \ | |/
| * Reflection: Copy invoke function also in the variadic caseNikita Popov2018-10-031-7/+5
| | | | | | | | | | It doesn't matter how the parameters are provided, we always have to copy the trampoline invoke function.
* | Fixed bug #66430Nikita Popov2018-10-023-0/+54
| |
View Lorry Controller Status