| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add trailing comma syntax support for mixed and unmixed group use lists | Sammy Kaye Powers | 2017-05-01 | 15 | -6/+161 |
| | | | | | RFC: https://wiki.php.net/rfc/list-syntax-trailing-commas | ||||
| * | Merge branch 'PHP-7.1' | Nikita Popov | 2017-05-01 | 2 | -1/+23 |
| |\ | |||||
| | * | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-05-01 | 2 | -1/+23 |
| | |\ | |||||
| | | * | Fix typo in SplFixedArray has_dimension implementation | Nikita Popov | 2017-05-01 | 2 | -1/+23 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2017-04-30 | 4 | -5/+14 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-04-30 | 4 | -5/+14 |
| | |\ \ | | |/ | |||||
| | | * | Fix compiler warnings when compiled against musl libc | Michael Heimpold | 2017-04-30 | 4 | -5/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | musl libc is complaining when <sys/poll.h> is used instead of <poll.h> so change this. This issue was reported for OpenWrt/LEDE where musl libc is the standard C library instead of e.g. glibc, see the following link for the original PR: https://github.com/openwrt/packages/pull/4263 Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> Signed-off-by: Michael Heimpold <mhei@heimpold.de> -- v3: refined checks/fallback paths as suggested by @bukka v2: rebased to resolve merge conflict in main/php_network.h v1: initial PR | ||||
| * | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2017-04-30 | 5 | -7/+5 |
| |\ \ \ | |/ / | |||||
| | * | | Fix bug #73808 (iv length warning too restrictive for aes-128-ccm) | Jakub Zelenka | 2017-04-30 | 6 | -7/+7 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Andrea Faulds | 2017-04-29 | 0 | -0/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Test ReflectionType support of iterable | Andrea Faulds | 2017-04-29 | 1 | -0/+2 |
| | | | | |||||
| * | | | Drop ZEND_API from zend_assert_valid_class_name | Andrea Faulds | 2017-04-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | This is a convenience function for internal use and shouldn't have been exported. | ||||
| * | | | Test ReflectionType support of iterable | Andrea Faulds | 2017-04-29 | 1 | -0/+2 |
| | | | | |||||
| * | | | [ci skip] yet more info for new rm | Anatol Belski | 2017-04-28 | 1 | -1/+12 |
| | | | | |||||
| * | | | use char* as we don't compile with UNICODE anyway | Anatol Belski | 2017-04-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | no vista anymore | Anatol Belski | 2017-04-28 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2017-04-27 | 0 | -0/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-04-27 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | Fix possible memory leak in openssl_encrypt and openssl_decrypt | Jakub Zelenka | 2017-04-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2017-04-27 | 4 | -3/+10 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-04-27 | 4 | -3/+10 |
| | |\ \ | | |/ | |||||
| | | * | Prefer using DIRECTORY_SEPARATOR in OpenSSL config path | Jakub Zelenka | 2017-04-27 | 3 | -3/+3 |
| | | | | |||||
| | | * | Add oid_section to the testing openssl.cnf | Jakub Zelenka | 2017-04-27 | 1 | -0/+7 |
| | | | | | | | | | | | | | It tests repeated OID addition | ||||
| * | | | Avoid unnecessary string copy | Anatol Belski | 2017-04-27 | 2 | -8/+4 |
| | | | | | | | | | | | | | which is the case when there's no impersonation. | ||||
| * | | | get rid of two strlen calls | Anatol Belski | 2017-04-27 | 3 | -8/+12 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Anatol Belski | 2017-04-27 | 0 | -0/+0 |
| |\ \ \ | |/ / | | | | | | | | | | | | | * PHP-7.1: [ci skip] update NEWS [ci skip] update NEWS | ||||
| | * | | [ci skip] update NEWS | Anatol Belski | 2017-04-27 | 1 | -0/+5 |
| | | | | |||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-04-27 | 0 | -0/+0 |
| | |\ \ | | |/ | | | | | | | | | | * PHP-7.0: [ci skip] update NEWS | ||||
| | | * | [ci skip] update NEWS | Anatol Belski | 2017-04-27 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Anatol Belski | 2017-04-27 | 2 | -55/+11 |
| |\ \ \ | |/ / | | | | | | | | | | | | | * PHP-7.1: Revert "Detect invalid port in xp_socket parse ip address" Revert "Follow up patch regarding bug #74216, see bug #74429" | ||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-04-27 | 2 | -55/+11 |
| | |\ \ | | |/ | | | | | | | | | | | | | * PHP-7.0: Revert "Detect invalid port in xp_socket parse ip address" Revert "Follow up patch regarding bug #74216, see bug #74429" | ||||
| | | * | Revert "Detect invalid port in xp_socket parse ip address" | Anatol Belski | 2017-04-27 | 2 | -55/+11 |
| | | | | | | | | | | | | | This reverts commit bab0b99f376dac9170ac81382a5ed526938d595a. | ||||
| | | * | Revert "Follow up patch regarding bug #74216, see bug #74429" | Anatol Belski | 2017-04-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | This reverts commit cda7dcf4cacef3346f9dc2a4dc947e6a74769259. | ||||
| * | | | Merge branch 'PHP-7.1' | Anatol Belski | 2017-04-26 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.1: sync bin sdk version | ||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-04-26 | 1 | -1/+1 |
| | |\ \ | | |/ | | | | | | | | | | * PHP-7.0: sync bin sdk version | ||||
| | | * | sync bin sdk version | Anatol Belski | 2017-04-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Jakub Zelenka | 2017-04-26 | 0 | -0/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-04-26 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | Do not add already added object to the internal OpenSSL table | Jakub Zelenka | 2017-04-26 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | This fixes OpenSSL 1.1 where adding object with OID that has been already added causes an error - preventing of duplication. | ||||
| * | | | Merge branch 'PHP-7.1' | Remi Collet | 2017-04-26 | 1 | -2/+3 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.1: rely on bundle config, instead of system one | ||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Remi Collet | 2017-04-26 | 1 | -2/+3 |
| | |\ \ | | |/ | | | | | | | | | | * PHP-7.0: rely on bundle config, instead of system one | ||||
| | | * | rely on bundle config, instead of system one | Remi Collet | 2017-04-26 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Remi Collet | 2017-04-26 | 0 | -0/+0 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.1: skip the test on OpenSSL < 1.1 for now | ||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Remi Collet | 2017-04-26 | 1 | -0/+1 |
| | |\ \ | | |/ | | | | | | | | | | * PHP-7.0: skip the test on OpenSSL < 1.1 for now | ||||
| | | * | skip the test on OpenSSL < 1.1 for now | Anatol Belski | 2017-04-26 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Remi Collet | 2017-04-26 | 0 | -0/+0 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.1: bump version after release | ||||
| | * | | bump version after release | Joe Watkins | 2017-04-25 | 3 | -5/+9 |
| | | | | |||||
| * | | | Merge branch 'PHP-7.1' | Anatol Belski | 2017-04-25 | 0 | -0/+0 |
| |\ \ \ | |/ / | | | | | | | | | | * PHP-7.1: move next | ||||
| | * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2017-04-25 | 0 | -0/+0 |
| | |\ \ | | |/ | | | | | | | | | | * PHP-7.0: move next | ||||
| | | * | move next | Anatol Belski | 2017-04-25 | 3 | -5/+9 |
| | | | | |||||
 |
index : delta/php-git.git | |
| git.php.net: repository/php-src.git |
| summaryrefslogtreecommitdiff |