summaryrefslogtreecommitdiff
path: root/ext
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ \
| * \ \ \ \ Merge branch 'PHP-5.4' into PHP-5.5Boris Lytochkin2013-02-072-11/+52
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * PHP-5.4: fix bug #64124 (IPv6 malformed)
| | * | | | fix bug #64124 (IPv6 malformed)Boris Lytochkin2013-02-072-11/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hostname returned from zend_parse_parameters() was modified in netsnmp_session_init() that caused imput parameter modification along with unpredictable changes when parameter is a constant sctring. One typo in comment was fixed.
* | | | | | Add support for begin_transaction in libmysql mode.Andrey Hristov2013-02-078-36/+289
| | | | | | | | | | | | | | | | | | | | | | | | Add support for flags and name for commit/rollback in libmysql mode
* | | | | | Export new callsAndrey Hristov2013-02-073-7/+5
| |_|/ / / |/| | | |
* | | | | Add the name in a comment at commit/rollback, if providedAndrey Hristov2013-02-071-1/+7
| | | | |
* | | | | Add support for commit and rollback options.Andrey Hristov2013-02-073-8/+142
| | | | | | | | | | | | | | | | | | | | | | | | | Add support for explicitly starting a transaction - modes also available. Using the API makes the life of load balancer mysqlnd plugins easier/possible.
* | | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-02-071-0/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | * PHP-5.4: Disabled external entities loading
| * | | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-02-071-0/+2
| |\ \ \ | | |/ / | |/| / | | |/ | | | * PHP-5.3: Disabled external entities loading
| | * Disabled external entities loadingDmitry Stogov2013-02-071-0/+2
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-02-071-1/+31
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Check if soap.wsdl_cache_dir confirms to open_basedir
| * | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-02-071-1/+31
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Check if soap.wsdl_cache_dir confirms to open_basedir
| | * Check if soap.wsdl_cache_dir confirms to open_basedirDmitry Stogov2013-02-071-1/+35
| | |
* | | make libvpx optionalAnatoliy Belsky2013-02-061-3/+9
| | |
* | | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-02-041-1/+8
|\ \ \ | |/ /
| * | check the validity of the parameterAndrey Hristov2013-02-041-1/+8
| | |
| * | Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4Andrey Hristov2013-02-047-56/+112
| |\ \
| | * | Move macro back to .c fileGustavo Lopes2013-02-022-8/+8
| | | | | | | | | | | | | | | | Because it depends on a static function on that .c file.
* | | | Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5Andrey Hristov2013-02-0437-594/+3692
|\ \ \ \
| * | | | implicit declaration of zend_throw_exceptionXinchen Hui2013-02-041-0/+1
| | | | |
| * | | | - Fixed ZTS buildFelipe Pena2013-02-031-1/+1
| | | | |
| * | | | Add option to specific the expected separator character.Martin Jansen2013-02-032-12/+39
| | | | |
| * | | | There is no need to use memchr() for comparisons in these places.Martin Jansen2013-02-031-3/+3
| | | | |
| * | | | ext/filter support for validating MAC addresses.Martin Jansen2013-02-038-34/+125
| | | | |
| * | | | Fix test on Windows.Gustavo Lopes2013-02-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows complains of invalid parameters because the socket is not bound. The test expected the error to be EAGAIN/EWOULDBLOCK. Moved the call down, after the socket is bound.
| * | | | Fix bug and hopefully build on WinSDK 6.1Gustavo Lopes2013-02-033-10/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There build was failing on rmtools on the sockets extension for two reasons: 1. IPV6_TCLASS and IPV6_RECVTCLASS not being defined. These are probably recent additions to SDK. Windows 7 doesn't event seem to have complete support for IPV6_TCLASS, not accepting in WSASendMsg(). The parts that needed this constant were not guarded by #ifdefs. They are now. 2. The constants EWOULDBLOCK and EINPROGRESS not being defined. These were only defined in php_network.h, outside of the extension, and not all source files included this header. Nevertheless, a macro defined in php_sockets.h needed these constants. When this macro was used in files that did not include php_network.h, the compilation would fail. Surprisingly, the build did not fail when using the 7.1 Windows SDK (more likely, the CRT headers used in VC10), as somehow errno.h was being included through some other standard header. This would make the constant EWOULDBLOCK defined; however, it would be defined to the wrong value. In the winsock context, WSAEWOULDBLOCK should be used instead. Because we have difficulty using Windows-only constants in the code, we (re)define EWOULDBLOCK to WSAEWOULDBLOCK. This has the obvious disavantage we may miss problems like this again in the future.
| * | | | php_strerror in ext/sockets renamed in 5.5Gustavo Lopes2013-02-021-1/+1
| | | | |
| * | | | Merge branch 'sendrecvmsg_rebase_55' into PHP-5.5Gustavo Lopes2013-02-0220-497/+3333
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sendrecvmsg_rebase_55: (31 commits) Fix multicast.c not defining errno on Windows Fix non-Windows build send/recvmsg() support for Windows Remove some pre-vista code Revert "Payload of HOPLIMIT/TCLASS are 8-bit" Ensure memory is initialized Payload of HOPLIMIT/TCLASS are 8-bit Fix buf in string -> int conv. Build fixes; accept names for if_index Refactoring: move stuff to new conversions.c Support sticky IPV6_PKTINFO Rename some functions for consistency Destroy ancillary registry on shutdown Move some multicast stuff to multicast.c Fix mcast_ipv6_send test Check return of fstat() Fix build on Mac OS X Register extra MSG_* constants Add test for CMSG_RIGHTS Add test for CMSG_CREDENTIALS message ...