clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,246 Commits 491 Branches 1,363 Tags 846 MiB
2a724becc1
Commit Graph

88246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
2a724becc1 Unused vars 2015-02-21 11:02:20 +08:00
Xinchen Hui
1c31ad4f0d Unused var 2015-02-21 10:58:23 +08:00
Dmitry Stogov
e142e31137 Fixed memory leak 2015-02-20 20:50:01 +03:00
Xinchen Hui
09ac3e931c uint32_t 2015-02-21 01:19:07 +08:00
Anthony Ferrara
b3be3c5b17 Clean up tri-state logic to use break instead 2015-02-20 11:54:33 -05:00
Anthony Ferrara
e3b020b945 Fix declare error behavior so that improper usages will actually error 2015-02-20 11:43:18 -05:00
Anatol Belski
cfae254b6b Merge branch 'PHP-5.6' 
* PHP-5.6:
  split test for bug #68557 for windows
 2015-02-20 16:02:32 +01:00
Anatol Belski
b21d0848c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  split test for bug #68557 for windows
 2015-02-20 16:02:07 +01:00
Anatol Belski
3082177bee split test for bug #68557 for windows 2015-02-20 16:01:34 +01:00
Julien Pauli
043e4fab21 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
  Updated NEWS
 2015-02-20 15:44:30 +01:00
Julien Pauli
95be012dce Updated NEWS 2015-02-20 15:44:18 +01:00
Julien Pauli
46e5f0c6bb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-02-20 15:43:53 +01:00
Julien Pauli
6393556a5d Updated NEWS 2015-02-20 15:43:38 +01:00
Julien Pauli
72af5cda27 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix #68557

Conflicts:
	ext/spl/spl_directory.c
 2015-02-20 15:40:46 +01:00
Julien Pauli
13c3b78f1e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix #68557
 2015-02-20 15:38:48 +01:00
Sobak
b97a9a8098 Drop ZE1-compat leftover 2015-02-20 15:29:54 +01:00
Julien Pauli
c111d1cd70 fix #68557 2015-02-20 15:09:35 +01:00
Dmitry Stogov
623810eff4 Use fast SSE2 memcpy() for copying block of data from SHM to process memory 2015-02-20 16:08:57 +03:00
Dmitry Stogov
5100afb7dd Simplify reallocation during copying data from SHM to process memory 2015-02-20 15:38:06 +03:00
Dmitry Stogov
5f76eed14e don't count op_arrays stored in opcache SHM 2015-02-20 14:59:30 +03:00
Dmitry Stogov
04836f0e55 Removed dead code 2015-02-20 13:46:32 +03:00
Dmitry Stogov
d85113702c Lazy duplication of op_array->static_variables 2015-02-20 13:28:26 +03:00
Dmitry Stogov
582aa41d6f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed type mismatch
 2015-02-20 10:33:07 +03:00
Dmitry Stogov
90421b0d5b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed type mismatch
 2015-02-20 10:32:34 +03:00
Dmitry Stogov
9fb48edf3c Fixed type mismatch 2015-02-20 10:31:24 +03:00
Stanislav Malyshev
543f011205 add NEWS for <=> 2015-02-19 23:03:51 +01:00
Michael Wallner
34ff6bbb0d this line got accitentally dropped on merge 2015-02-19 10:50:03 +01:00
Dmitry Stogov
6b779596d7 Implemented AST pretty-printer 2015-02-19 11:11:17 +03:00
Ferenc Kovacs
e7ee01980e Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS to match the actual stuff in 5.6.6
  update NEWS to match the actual stuff in 5.5.22
 2015-02-18 20:15:46 +01:00
Ferenc Kovacs
97dd859c9c update NEWS to match the actual stuff in 5.6.6 2015-02-18 20:10:28 +01:00
Ferenc Kovacs
d58e76fd69 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS to match the actual stuff in 5.5.22
 2015-02-18 20:09:12 +01:00
Ferenc Kovacs
3d777c8068 update NEWS to match the actual stuff in 5.5.22 2015-02-18 20:08:46 +01:00
Ferenc Kovacs
3c5e0807e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS(add missing entry for the enchant fix, and reorder the entries a bit)
  fix typo in bug#
  add CVE
  5.4.39 next
 2015-02-18 19:52:32 +01:00
Ferenc Kovacs
73a9c701ad update NEWS(add missing entry for the enchant fix, and reorder the entries a bit) 2015-02-18 19:52:00 +01:00
Ferenc Kovacs
3261995092 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix typo in bug#
  add CVE
  5.4.39 next
 2015-02-18 19:49:23 +01:00
Ferenc Kovacs
24be46323b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix typo in bug#
  add CVE
  5.4.39 next

Conflicts:
	configure.in
	main/php_version.h
 2015-02-18 19:48:50 +01:00
Ferenc Kovacs
c17a17e44b fix typo in bug# 2015-02-18 19:47:07 +01:00
Ferenc Kovacs
2ee41118c8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
 2015-02-18 19:40:21 +01:00
Ferenc Kovacs
c0a5905522 update NEWS 2015-02-18 19:39:58 +01:00
Ferenc Kovacs
a4771ae667 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix email format
 2015-02-18 19:20:36 +01:00
Ferenc Kovacs
920de2cbe8 fix email format 2015-02-18 19:20:13 +01:00
Ferenc Kovacs
78bb5091a3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  update 5.6.6 release date in NEWS
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
 2015-02-18 16:34:02 +01:00
Ferenc Kovacs
941c1a5fa8 update NEWS 2015-02-18 16:33:32 +01:00
Ferenc Kovacs
4bae11b533 update 5.6.6 release date in NEWS 2015-02-18 16:32:57 +01:00
Ferenc Kovacs
68128efa4b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
 2015-02-18 16:32:23 +01:00
Ferenc Kovacs
08b6fe9ef1 Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI) 2015-02-18 16:24:09 +01:00
Michael Wallner
e4294ef6e5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
 2015-02-18 14:08:58 +01:00
Michael Wallner
6dfc7cbe61 BFN 2015-02-18 14:08:52 +01:00
Michael Wallner
2137354988 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
 2015-02-18 14:06:49 +01:00
Michael Wallner
ec7ba48e67 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-02-18 14:06:39 +01:00