summaryrefslogtreecommitdiff
path: root/ext
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-242-10/+44
| |\ | | | | | | | | | | | | Conflicts: ext/spl/spl_fixedarray.c
| | * Fixed bug #64264 (SPLFixedArray toArray problem)Xinchen Hui2013-02-242-11/+42
| | |
* | | sendrecvmsg_shutdown function moved to mshutdownGustavo Lopes2013-02-241-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | 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-212-2/+2
| | |
* | | 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 'bug49348' into PHP-5.5Stanislav Malyshev2013-02-216-154/+154
|\ \ \ | | | | | | | | | | | | | | | | | | | | * bug49348: fix tests fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
| * | | fix bug #49348 - issue notice on get_property_ptr_ptr when used for readStanislav Malyshev2013-02-186-154/+154
| | | |
* | | | 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.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
| | |
* | | 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.
* | | fix protosStanislav Malyshev2013-02-171-5/+5
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-02-172-0/+26
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
| * | fix bug #61930: openssl corrupts ssl key resource when using ↵Stanislav Malyshev2013-02-172-0/+26
| | | | | | | | | | | | openssl_get_publickey()
* | | fix free vs. curl_freeAnatol Belski2013-02-171-2/+2
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-02-171-0/+25
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-02-171-0/+25
| |\ \ | | |/
| | * Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS)Xinchen Hui2013-02-172-1/+27
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-02-161-2/+0
|\ \ \ | |/ /
| * | Fix test failed after 0ea83ff8478d867ebf1603a43cd5d3432022cee7Xinchen Hui2013-02-161-2/+0
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-02-131-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Proper bit reset code
| * | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-02-131-2/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Proper bit reset code
| | * Proper bit reset codeDmitry Stogov2013-02-131-2/+2
| | |
| * | mb_split() can now handle empty matches like preg_split() does.Moriyoshi Koizumi2013-02-103-40/+46
| | |
| * | Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4Boris Lytochkin2013-02-071-0/+2
| |\ \
* | | | build fixesAndrey Hristov2013-02-111-3/+3
| | | |
* | | | mb_split() can now handle empty matches like preg_split() does.Moriyoshi Koizumi2013-02-103-40/+46
| | | |
* | | | update test caseAndrey Hristov2013-02-081-0/+46
| | | |
* | | | mysqli_savepoint()/mysqli_release_savepoint()Andrey Hristov2013-02-085-3/+98
| | | |
* | | | Add the constants needed for mysqli_commit(), _rollback() andAndrey Hristov2013-02-082-3/+20
| | | | | | | | | | | | | | | | begin_transaction()
* | | | Add savepoint and rollback to savepoint supportAndrey Hristov2013-02-083-0/+72
| | | |
* | | | Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5Andrey Hristov2013-02-072-11/+52
|\ \ \ \
| * \ \ \ Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5Boris Lytochkin2013-02-074-8/+150
| |\ \ \ \
View Lorry Controller Status