clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,702 Commits 493 Branches 1,365 Tags 848 MiB
b32405053f
Commit Graph

29169 Commits

Author SHA1 Message Date
Boris Lytochkin
b32405053f Fix bug #61981 2013-03-17 20:00:37 +04:00
Etienne Kneuss
5de1b08482 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Remove spurious int cast in between two longs
 2013-03-16 18:20:06 +01:00
Etienne Kneuss
62364e6e01 Remove spurious int cast in between two longs 2013-03-16 18:19:14 +01:00
Anatol Belski
90c8f16c3b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Backported patch for #64370
 2013-03-15 19:08:32 +01:00
Anatol Belski
b903d2d6cd Backported patch for #64370 2013-03-15 19:04:40 +01:00
Anatol Belski
5df8cf1975 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix zts check
 2013-03-14 14:39:09 +01:00
Anatol Belski
e43c5a8395 fix zts check 2013-03-14 14:38:20 +01:00
Andrey Hristov
0777a18703 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2013-03-13 14:24:23 +01:00
Andrey Hristov
f1e2edff8b fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind 2013-03-13 13:37:51 +01:00
Anatol Belski
a328cc452e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed headers order
 2013-03-12 08:34:16 +01:00
Anatol Belski
bdaafe3c7b fixed headers order 2013-03-12 08:33:36 +01:00
Derick Rethans
98bb5f4798 Merge branch 'PHP-5.3' into PHP-5.4 2013-03-11 21:36:37 +00:00
Derick Rethans
50ad2af503 - Updated to version 2013.2 (2013b) 2013-03-11 21:36:36 +00:00
Xinchen Hui
f52b2e6a65 Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail) 
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
 2013-03-09 23:00:58 +08:00
Anatol Belski
4e46a87392 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed PCRE locale crash in Windows/TS
 2013-03-04 09:14:14 +01:00
Stephen A. Zarkos
b6fdb60ecf Fixed PCRE locale crash in Windows/TS 2013-03-04 09:09:45 +01:00
Anatol Belski
ca4a3e6138 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  merged PCRE 8.32
 2013-03-03 19:07:49 +01:00
Anatol Belski
357ab3cbad merged PCRE 8.32 
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
 2013-03-03 19:06:22 +01:00
Derick Rethans
a3f020a4be Merge branch 'PHP-5.3' into PHP-5.4 2013-03-03 12:53:23 -05:00
Derick Rethans
c134f2a1a5 - Updated to version 2013.1 (2013a) 2013-03-03 12:53:22 -05:00
Xinchen Hui
fe5ce5cb91 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-03-03 11:25:08 +08:00
Xinchen Hui
9bda6a25a5 Fix test (skip on unable to create socket) 2013-03-03 11:24:45 +08:00
Stanislav Malyshev
7c08232509 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bug #52861: unset fails with ArrayObject and deep arrays
 2013-02-26 22:12:36 -08:00
Mike Willbanks
61099f8585 Bug #52861: unset fails with ArrayObject and deep arrays 
When checking to make into a reference write, readwrite are checked but not unset
 2013-02-26 22:11:52 -08:00
Xinchen Hui
d24ac6953e Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/spl/spl_fixedarray.c
 2013-02-24 12:58:39 +08:00
Xinchen Hui
1b58bd39a6 Fixed bug #64264 (SPLFixedArray toArray problem) 2013-02-24 12:55:53 +08:00
Johannes Schlüter
064c62e4cf Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs) 2013-02-21 16:49:28 +01:00
Johannes Schlüter
1e9bc56775 Merge branch 'PHP-5.3' into PHP-5.4 2013-02-21 15:10:15 +01:00
Johannes Schlüter
fcd4b5335a Fix TSRM (after afc1debb) 2013-02-21 15:08:58 +01:00
Dmitry Stogov
b5d267aa95 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  PHAR should modify entry timestamp when it's modified
 2013-02-21 15:57:26 +04:00
Dmitry Stogov
7b113d789d PHAR should modify entry timestamp when it's modified 2013-02-21 15:55:20 +04:00
Sara Golemon
c16d6befd4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  http-stream test requires network connectivity
 2013-02-21 03:21:49 -08:00
Sara Golemon
bc55a8eb9f http-stream test requires network connectivity 2013-02-21 03:21:23 -08: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
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
7b0107cc5d fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey() 2013-02-17 13:28:42 -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
375e3c273b Fix test failed after 0ea83ff847 2013-02-16 22:28:28 +08: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
Moriyoshi Koizumi
0ea83ff847 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:04:23 +09: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
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
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
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