summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update version for PHP 7.3.3RC1php-7.3.3RC1Christoph M. Becker2019-02-194-5/+5
|
* Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-181-8/+7
|\
| * Make MADV_HUGEPAGE conditional on USE_ZEND_ALLOC_HUGE_PAGESNikita Popov2019-02-181-7/+8
| | | | | | | | | | | | There have been multiple reports of large slowdowns due to the use of MADV_HUGEPAGE, so make it conditional on USE_ZEND_ALLOC_HUGE_PAGES, just like MAP_HUGETLB already is.
* | Fix #77626: Persistence confusion in php_com_import_typelib()Christoph M. Becker2019-02-152-2/+3
| | | | | | | | | | | | | | | | We apply only the most minimal fix here, and will cater to the unnecessary re-allocation for PHP-7.4. We don't need to add a regression test, since bug39606.phpt and bug77621.phpt already show the misbehavior.
* | Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-02-153-3/+25
|\ \ | |/ | | | | | | * PHP-7.2: Fix #77621: Already defined constants are not properly reported
| * Fix #77621: Already defined constants are not properly reportedChristoph M. Becker2019-02-153-3/+25
| | | | | | | | | | | | We must not check uninitialized values (i.e. `c.value`), and we have to use proper types for printf-style formats (i.e. `char *` instead of `zend_string *`).
* | Fixed bug #77612Nikita Popov2019-02-142-51/+37
| | | | | | | | | | Port php_setcookie() to use the smart_str API to ensure that there can be no string truncation issues.
* | Work around compiler flag dependent ABINikita Popov2019-02-142-1/+19
| |
* | Merge branch 'PHP-7.2' into PHP-7.3Peter Kokot2019-02-132-82/+8
|\ \ | |/ | | | | | | * PHP-7.2: Refactor timelib.m4
| * Refactor timelib.m4Peter Kokot2019-02-132-85/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ext/date/lib is bundled library and also includes additional timelib.m4 macros and checks specific for PHP. All the checks in the timelib.m4 are already done in the PHP's configure.ac: - headers except for io.h and strings.h - two functions checked strftime and gettimeofday - if size of longint is 8 - if size of int is 4 - int32_t and uint32_t types using the PHP_CHECK_STDINT_TYPES Macro `AC_TIMELIB_C_BIGENDIAN` defined in timelib.m4 is not used. The two checkings for strtoll and atoll have been moved to date extension's config0.m4 file. Additional check for headers <io.h> and <strings.h> has been added to config0.m4 of the date extension. Therefore the timelib.m4 can be simplified and removed from the bundled library to have easier maintenance in the later branches and also upstream library.
* | Merge branch 'PHP-7.2' into PHP-7.3Johannes Schlüter2019-02-120-0/+0
|\ \ | |/
| * Merge remote-tracking branch 'origin/PHP-7.2' into PHP-7.2Johannes Schlüter2019-02-1218-139/+138
| |\
* | \ Merge remote-tracking branch 'origin/PHP-7.3' into PHP-7.3Johannes Schlüter2019-02-1219-139/+147
|\ \ \
| * \ \ Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-126-18/+23
| |\ \ \ | | | |/ | | |/|
| | * | Fixed bug #75546DanielCiochiu2019-02-126-18/+23
| | | | | | | | | | | | | | | | | | | | By respecting the SILENT flag when checking the visibility of a class constant.
| * | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-123-9/+13
| |\ \ \ | | |/ /
| | * | Fixed bug #77608Nikita Popov2019-02-123-9/+13
| | | | | | | | | | | | | | | | Remove special handling of doubles and escape them as usual instead.
| * | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-122-0/+26
| |\ \ \ | | |/ /
| | * | Make pid & uid available while handling realtime signalshsldymq2019-02-122-0/+26
| | | |
| * | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-121-8/+1
| |\ \ \ | | |/ /
| | * | Remove "defensive copy" of DatePeriod propertiesNikita Popov2019-02-121-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | get_properties() constructs these as fresh objects with no relation to the internals, there is no need to clone them again. Additionally the current implementation leaks memory, because the original objects are never freed (see PR #3121).
| * | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-124-0/+25
| |\ \ \ | | |/ /
| | * | Fixed bug #77564: Memory leak in exif_process_IFD_TAGBen Ramsey2019-02-124-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | The memory leak occurs when more than one UserComment tag is present in the EXIF data. It's still considered corrupt EXIF data, but this ensures the memory is freed before trying to set to already allocated memory.
| * | | Fixed bug #77599 (Unbuffered queries; native prepared statements memory leak)Dmitry Stogov2019-02-122-0/+13
| | | |
| * | | Merge branch 'PHP-7.2' into PHP-7.3Dmitry Stogov2019-02-124-103/+56
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.2: Avoid dependency on "struct flock" fields order.
| | * | Avoid dependency on "struct flock" fields order.Dmitry Stogov2019-02-124-103/+56
| | | |
| * | | Merge branch 'PHP-7.2' into PHP-7.3Anatol Belski2019-02-111-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.2: Replace broken binary SDK version
| | * | Replace broken binary SDK versionAnatol Belski2019-02-111-1/+1
| | | |
| * | | Merge branch 'PHP-7.2' into PHP-7.3Anatol Belski2019-02-111-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-7.2: Update SDK version for AppVeyor
| | * | Update SDK version for AppVeyorAnatol Belski2019-02-111-1/+1
| | | |
* | | | Merge branch 'PHP-7.2' into PHP-7.3Darek Slusarczyk2019-02-1118-6/+149
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'PHP-7.1' into PHP-7.2Darek Slusarczyk2019-02-1118-6/+149
| |\ \ | | |/ | |/|
| | * security fix - by default 'local infile' is disabled:Darek Slusarczyk2019-02-1118-6/+148
| | | | | | | | | | | | | | | | | | | | | | | | - set default for mysqli.allow_local_infile=0 - explicitly disable PDO::MYSQL_ATTR_LOCAL_INFILE in case of lack of driver options - add getAttribute support for PDO::MYSQL_ATTR_LOCAL_INFILE - update existing tests where needed - add new tests [checking default value and setting on] the 'local infile' in ext/mysqli and ext/pdo_mysql
| | * Use pkg-config for ICU, as the old icu-config has been deprecatedDerick Rethans2019-02-071-32/+66
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-114-6/+55
|\ \ \ | |/ /
| * | Fix bug #51068 (glob:// do not support current path relative)Ahmed Abdou2019-02-114-6/+55
| | | | | | | | | | | | Fix DirectoryIterator glob://* current path relative queries
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-113-0/+38
|\ \ \ | |/ /
| * | Fix #77552: Uninitialized buffer in stat functionsjohnstevenson2019-02-113-0/+38
| | |
* | | Fix tests bareword fallback with error suppressionGuilliam Xavier2019-02-1118-278/+258
| | | | | | | | | | | | | | | (cherry picked from commit aad39879f2d2e89de105c4f87d334ee129b4321c) (cherry picked from commit 76f8a908bb18aee92b8f3d523b74b06c9d12cb6b)
* | | regenerate with re2c 1.0.3Xinchen Hui2019-02-112-1758/+1709
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Xinchen Hui2019-02-115-1767/+1860
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-7.2: Fixed bug #77589 (Core dump using parse_ini_string with numeric sections) Conflicts: Zend/zend_ini_scanner.c
| * | Fixed bug #77589 (Core dump using parse_ini_string with numeric sections)Xinchen Hui2019-02-114-130/+176
| | | | | | | | | | | | Section name should not be typed(NULL, FALSE, TRUE etc)
* | | Merge PDO_OCI PRChristopher Jones2019-02-111-0/+4
| | |
* | | Merge branch 'PHP-7.2' into PHP-7.3Christopher Jones2019-02-118-13/+381
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-7.2: PDO_OCI tracing attribute PR merge pdo_oci: Add client identifier and module attrs pdo_oci: Register new attr constants and add tests pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO
| * | PDO_OCI tracing attribute PR mergeChristopher Jones2019-02-111-0/+4
| | |
| * | pdo_oci: Add client identifier and module attrsCameron Porter2019-02-118-45/+206
| | | | | | | | | | | | | | | Add tests for the new attributes, and check the setAttribute return value.
| * | pdo_oci: Register new attr constants and add testsCameron Porter2019-02-114-0/+169
| | |
| * | pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFOCameron Porter2019-02-112-0/+38
| | | | | | | | | | | | | | | Add the ability to set the action and client info on the database session for PDO OCI using PDO attributes.
* | | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-02-081-1/+1
|\ \ \ | |/ /
| * | Fix FTPS passive mode of data channel event pollYanTao2019-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | Bugfix: when using passive mode of FTPS protocol, data channel events should be polled when creating data connection channel, instead of polling the event of ftp's self control channel, which may cause ftp transfer problem while using ftps and passive mode.