php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
72,901 Commits 547 Branches 1,481 Tags
d39554ac08ef4a2db4a67aeca08334cb02ff3b47
Commit Graph

31043 Commits

Author SHA1 Message Date
Stanislav Malyshev
d39554ac08 Merge branch 'bug49348' into PHP-5.5 
* bug49348:
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
 2013-02-21 00:52:46 -08:00
Dmitry Stogov
20c623c9be Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed external entity loading
 2013-02-20 22:30:59 +04:00
Dmitry Stogov
c737b89473 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed external entity loading

Conflicts:
	ext/libxml/libxml.c
	ext/libxml/php_libxml.h
 2013-02-20 22:27:41 +04:00
Dmitry Stogov
8e76d0404b Fixed external entity loading 2013-02-20 22:14:59 +04:00
Anatol Belski
43664e656d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix the test for curl 7.29.0+
 2013-02-19 09:05:27 +01:00
Anatol Belski
cc34dfce16 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix the test for curl 7.29.0+
 2013-02-19 09:04:52 +01:00
Anatol Belski
558c5dbe65 fix the test for curl 7.29.0+ 2013-02-19 09:04:06 +01:00
Stanislav Malyshev
0c6d903ce7 fix bug #49348 - issue notice on get_property_ptr_ptr when used for read 2013-02-18 20:56:02 -08:00
Gustavo Lopes
91538e4e13 Cleanup some multicast code; fix for mac os x? 
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.
 2013-02-17 22:42:58 +01:00
Stanislav Malyshev
17c6389e9e fix protos 2013-02-17 13:33:48 -08:00
Stanislav Malyshev
0841eca580 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
 2013-02-17 13:29:34 -08:00
Stanislav Malyshev
7b0107cc5d fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey() 2013-02-17 13:28:42 -08:00
Anatol Belski
432d59ab55 fix free vs. curl_free 2013-02-17 20:29:20 +01:00
Xinchen Hui
d3291de51a Merge branch 'PHP-5.4' into PHP-5.5 2013-02-17 11:06:33 +08:00
Xinchen Hui
263accb626 Merge branch 'PHP-5.3' into PHP-5.4 2013-02-17 11:05:34 +08:00
Xinchen Hui
01ae5c3c2f Fixed bug #64228 (RecursiveDirectoryIterator always assumes SKIP_DOTS) 2013-02-17 11:04:36 +08:00
Xinchen Hui
69b80a93de Merge branch 'PHP-5.4' into PHP-5.5 2013-02-16 22:29:14 +08:00
Xinchen Hui
375e3c273b Fix test failed after 0ea83ff847 2013-02-16 22:28:28 +08:00
Dmitry Stogov
1bde2b4fc9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Proper bit reset code
 2013-02-13 22:07:57 +04:00
Dmitry Stogov
4b900f4831 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Proper bit reset code
 2013-02-13 22:07:21 +04:00
Dmitry Stogov
188c196d4d Proper bit reset code 2013-02-13 22:06:37 +04:00
Andrey Hristov
5bfdf4f069 build fixes 2013-02-11 12:07:10 +01:00
Moriyoshi Koizumi
20eb33b321 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:05:17 +09:00
Moriyoshi Koizumi
0ea83ff847 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:04:23 +09:00
Andrey Hristov
a5b426eeff update test case 2013-02-08 18:28:22 +01:00
Andrey Hristov
43ecd8fe1b mysqli_savepoint()/mysqli_release_savepoint() 2013-02-08 18:09:50 +01:00
Andrey Hristov
0da369ae50 Add the constants needed for mysqli_commit(), _rollback() and 
begin_transaction()
 2013-02-08 17:05:25 +01:00
Andrey Hristov
666a835660 Add savepoint and rollback to savepoint support 2013-02-08 16:36:17 +01:00
Andrey Hristov
e1e22fd2e4 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-02-07 20:35:30 +01:00
Andrey Hristov
afacdecd1f Add support for begin_transaction in libmysql mode. 
Add support for flags and name for commit/rollback in libmysql mode
 2013-02-07 18:45:49 +01:00
Boris Lytochkin
92a7924c1a Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4 2013-02-07 21:43:37 +04:00
Boris Lytochkin
e09211545c Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 2013-02-07 21:42:07 +04:00
Andrey Hristov
403d4fbbff Export new calls 2013-02-07 18:29:19 +01:00
Andrey Hristov
49e3d91ad9 Add the name in a comment at commit/rollback, if provided 2013-02-07 16:24:08 +01:00
Andrey Hristov
9fb0dba4be Add support for commit and rollback options. 
Add support for explicitly starting a transaction - modes also available.
Using the API makes the life of load balancer mysqlnd plugins easier/possible.
 2013-02-07 16:05:27 +01:00
Dmitry Stogov
0547a36e95 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Disabled external entities loading
 2013-02-07 16:09:49 +04:00
Dmitry Stogov
1a18e84822 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Disabled external entities loading
 2013-02-07 16:09:12 +04:00
Dmitry Stogov
afe98b7829 Disabled external entities loading 2013-02-07 16:07:05 +04:00
Boris Lytochkin
6c5c04888d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #64124 (IPv6 malformed)
 2013-02-07 14:49:45 +04:00
Boris Lytochkin
ed6763420c fix bug #64124 (IPv6 malformed) 
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.
 2013-02-07 14:48:28 +04:00
Dmitry Stogov
4730bc8680 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Check if soap.wsdl_cache_dir confirms to open_basedir
 2013-02-07 13:12:01 +04:00
Dmitry Stogov
702b436ef4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Check if soap.wsdl_cache_dir confirms to open_basedir
 2013-02-07 13:10:04 +04:00
Dmitry Stogov
cc4c318b0c Check if soap.wsdl_cache_dir confirms to open_basedir 2013-02-07 13:04:47 +04:00
Anatoliy Belsky
215da6057f make libvpx optional 2013-02-06 16:22:27 +01:00
Andrey Hristov
c311884e5b Merge branch 'PHP-5.4' into PHP-5.5 2013-02-04 14:28:23 +01:00
Andrey Hristov
740b823be8 check the validity of the parameter 2013-02-04 14:27:56 +01:00
Andrey Hristov
643ce95b5b Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 2013-02-04 14:15:58 +01:00
Andrey Hristov
cb8b2dd2e0 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-02-04 14:15:29 +01:00
Xinchen Hui
53159f6e05 implicit declaration of zend_throw_exception 2013-02-04 14:20:50 +08:00
Felipe Pena
7369a68379 - Fixed ZTS build 2013-02-03 10:57:31 -02:00