summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-02-242-10/+44
|\
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-02-243-10/+45
| |\ | | | | | | | | | | | | Conflicts: ext/spl/spl_fixedarray.c
| | * Fixed bug #64264 (SPLFixedArray toArray problem)Xinchen Hui2013-02-243-11/+43
| | |
* | | sendrecvmsg_shutdown function moved to mshutdownGustavo Lopes2013-02-242-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | The function php_socket_sendrecvmsg_shutdown() should have been called in MSHUTDOWN, not RSHUTDOWN. Bug only on TSRM builds. Should fix bug #64287.
* | | Fix ext/sockets build with phpizeGustavo Lopes2013-02-243-8/+4
| | | | | | | | | | | | Fixes bug #64285
* | | Fix ext/intl build with phpizeGustavo Lopes2013-02-241-1/+1
| | | | | | | | | | | | Fixes bug #64284.
* | | NEWS for 8718755Gustavo Lopes2013-02-231-0/+4
| | |
* | | Remove trailing whitespace; break long linesGustavo Lopes2013-02-231-25/+27
| | |
* | | Merge branch 'dval_to_lval' into PHP-5.5Gustavo Lopes2013-02-234-6/+87
|\ \ \ | | | | | | | | | | | | | | | | | | | | * dval_to_lval: Fix rounding of zend_dval_to_lval Fix zend_dval_to_lval outside 64bit integers range
| * | | Fix rounding of zend_dval_to_lvalGustavo Lopes2013-02-232-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Now rounding is always towards zero; the rounding can be though as if occurring on the original double. Only relevant for the 32-bit long variant.
| * | | Fix zend_dval_to_lval outside 64bit integers rangeGustavo Lopes2013-02-234-6/+80
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP should preserve the least significant bits when casting from double to long. Zend.m4 contains this: AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits]) If ZEND_DVAL_TO_LVAL_CAST_OK is not defined, zend_operators.h had an inline implementation of zend_dval_to_lval() that would do a cast to an int64_t (when sizeof(long) == 4), then a cast to unsigned long and finally the cast to long. While this works well for doubles inside the range of values of the type used in the first cast (int64_t in the 32-bit version and unsigned long in the 64-bit version), if outside the range, it is undefined behavior that WILL give varying and not particularly useful results. This commit uses fmod() to first put the double in a range that can safely be cast to unsigned long and then casts this unsigned long to long. This last cast is implementation defined, but it's very likely that this gives the expected result (i.e. the internal 2's complement representation is unchanged) on all platforms that PHP supports. In any case, the previous implementationa already had this assumption. This alternative code path is indeed significantly slower than simply casting the double (almost an order of magnitude), but that should not matter because casting doubles with a very high absolute value is a rare event.
* | | relax the checkAndrey Hristov2013-02-221-1/+1
| | |
* | | Add some parameter checksAndrey Hristov2013-02-221-5/+22
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-02-212-2/+2
|\ \ \ | |/ /
| * | Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)Johannes Schlüter2013-02-213-2/+6
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-02-211-4/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-02-211-4/+6
| |\ \ | | |/
| | * Fix TSRM (after afc1debb)Johannes Schlüter2013-02-211-4/+6
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-02-211-2/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: PHAR should modify entry timestamp when it's modified
| * | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-02-211-2/+5
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: PHAR should modify entry timestamp when it's modified
| | * PHAR should modify entry timestamp when it's modifiedDmitry Stogov2013-02-211-2/+5
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Sara Golemon2013-02-211-0/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: http-stream test requires network connectivity
| * | Merge branch 'PHP-5.3' into PHP-5.4Sara Golemon2013-02-211-0/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: http-stream test requires network connectivity
| | * http-stream test requires network connectivitySara Golemon2013-02-211-0/+1
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-02-216-4/+77
|\ \ \ | |/ /
| * | Fixed bug #64235 (Insteadof not work for class method in 5.4.11)Xinchen Hui2013-02-217-4/+79
| | | | | | | | | | | | | | | | | | As we discussed with stefan, we think previous of allowing use with classes is a bug, should be forbided, anyway, the error message should be improved.
* | | added back the older vc9 favoursAnatol Belski2013-02-211-0/+10
| | |
* | | updated lib versionsAnatol Belski2013-02-211-16/+16
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-02-210-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: updated lib versions updated lib versions
| * | updated lib versionsAnatol Belski2013-02-211-4/+4
| | |
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-02-210-0/+0
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: updated lib versions
| | * updated lib versionsAnatol Belski2013-02-211-5/+5
| | |
* | | news for bug #49348Stanislav Malyshev2013-02-211-0/+4
| | |
* | | Merge branch 'bug49348' into PHP-5.5Stanislav Malyshev2013-02-2116-215/+245
|\ \ \ | | | | | | | | | | | | | | | | | | | | * bug49348: fix tests fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
| * | | fix testsStanislav Malyshev2013-02-184-4/+32
| | | |
| * | | fix bug #49348 - issue notice on get_property_ptr_ptr when used for readStanislav Malyshev2013-02-1812-211/+213
| | | |
* | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-02-203-20/+26
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * PHP-5.4: Fixed external entity loading
| * | | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-02-203-20/+26
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fixed external entity loading Conflicts: ext/libxml/libxml.c ext/libxml/php_libxml.h
| | * | Fixed external entity loadingDmitry Stogov2013-02-203-20/+26
| | | |
* | | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-02-200-0/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-5.3' into PHP-5.4Johannes Schlüter2013-02-200-0/+0
| |\ \ \ | | |/ /
| | * | 5.3.22 NEWSJohannes Schlüter2013-02-201-4/+6
| | | |
* | | | Start new NEWS section for beta1David Soria Parra2013-02-191-0/+2
| | | |
* | | | News for PHP 5.5.0 Alpha 5David Soria Parra2013-02-191-1/+1
| | | |
* | | | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-02-191-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.4: fix the test for curl 7.29.0+
| * | | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-02-191-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.3: fix the test for curl 7.29.0+
| | * | fix the test for curl 7.29.0+Anatol Belski2013-02-191-1/+1
| | | |
* | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-02-182-6/+40
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | * PHP-5.4: Fixed bug #64070 (Inheritance with Traits failed with error) Conflicts: NEWS Zend/zend_compile.c
| * | Fixed bug #64070 (Inheritance with Traits failed with error)Dmitry Stogov2013-02-183-6/+41
| | |
* | | Cleanup some multicast code; fix for mac os x?Gustavo Lopes2013-02-173-38/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I moved some stuff from sockets.c to multicast.c, I did not copy some conditional defines for systems without the RFC 3678 API. I moved such defines to multicast.h so both sockets.c and multicast.c can benefit from them and I prefixed them with PHP_ so that it's less confusing: now PHP_MCAST_* are defined to either the MCAST_* RFC 3678 APIs or to legacy APIs and MCAST_* always mean the (possibly undefined) system definitions.
View Lorry Controller Status