clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,525 Commits 491 Branches 1,363 Tags 847 MiB
4513475a41
Commit Graph

82525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
krakjoe
4513475a41 fix ZTS build 2014-08-10 09:31:02 +01:00
Dmitry Stogov
4a3e501fb3 cleanup 2014-08-08 13:47:34 +04:00
Dmitry Stogov
50a76860bd Fixed GC for inner-loops (ext/standard/tests/array/compact_variation1.phpt). 
Fixed bug #63734.
 2014-08-07 18:50:03 +04:00
Dmitry Stogov
417ed16d11 Make stream->context indirect trough zend_resource (stream->ctx->ptr). 
Fixed ext/standard/tests/streams/bug61115.phpt
 2014-08-07 15:55:37 +04:00
Dmitry Stogov
414762fc12 Fixed GC (Zend/tests/bug63635.phpt) 2014-08-06 15:31:07 +04:00
Dmitry Stogov
e677e8cc87 Fixed ext/wddx/tests/bug48562.phpt 2014-08-05 23:48:27 +04:00
Dmitry Stogov
e3b610c245 typo 2014-08-05 20:55:15 +04:00
Dmitry Stogov
da2097b349 Fixed argument numbering 2014-08-05 18:17:05 +04:00
Dmitry Stogov
ce1af1e47b Fixed bug #67725 (now we create immutable arrays only in SHM) 2014-08-05 15:38:43 +04:00
Dmitry Stogov
3700364ca5 Don't waste SHM for unused Buckets 2014-08-04 22:51:41 +04:00
Dmitry Stogov
b5590a2f87 Fixed incorrect arguments handling 2014-08-04 21:31:13 +04:00
Dmitry Stogov
415482ac0a Delete immutable arrays copied into SHM (related to bug #67725) 2014-08-04 20:20:12 +04:00
Dmitry Stogov
7301994c28 Merge branch 'master' into phpng 
* master: (46 commits)
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  ...

Conflicts:
	Zend/tests/errmsg_040.phpt
	Zend/tests/ns_059.phpt
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	ext/openssl/openssl.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c
 2014-08-04 13:56:27 +04:00
Andrea Faulds
fe894c2154 PHP_INT_MIN and _MAX tests 2014-08-01 17:01:17 +01:00
Andrea Faulds
a2bbc6f985 Merge branch 'PHP_INT_MIN' 2014-08-01 16:29:34 +01:00
Andrea Faulds
d6cf8be094 NEWS and UPGRADING 2014-08-01 16:28:20 +01:00
Andrea Faulds
24d7fc2bbc Added PHP_INT_MIN 2014-08-01 14:29:50 +01:00
Andrey Hristov
1d609d2d26 Merge branch 'PHP-5.6' 2014-07-31 21:28:19 +03:00
Andrey Hristov
f5deb18b20 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-31 21:28:09 +03:00
Andrey Hristov
95febf26c6 Fix wrong lenght size 2014-07-31 21:27:51 +03:00
Peter Cowburn
d5542c4a17 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #51096 - Remove unnecessary ? for first/last day of
 2014-07-31 14:35:13 +01:00
Peter Cowburn
6a4f0b14eb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #51096 - Remove unnecessary ? for first/last day of
 2014-07-31 14:34:50 +01:00
Peter Cowburn
c2f2d5c8fc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
	ext/date/lib/parse_date.c
 2014-07-31 14:33:55 +01:00
Peter Cowburn
bff84d7c18 Merge branch 'pull-request/754' into PHP-5.4 2014-07-31 14:30:39 +01:00
Peter Cowburn
358aedc454 Bug #51096 - Remove unnecessary ? for first/last day of 2014-07-31 14:21:38 +01:00
Xinchen Hui
863a603fad Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 2014-07-31 18:16:08 +08:00
Xinchen Hui
238a3167e6 Fixed valgrind issues 2014-07-31 18:15:47 +08:00
Dmitry Stogov
534dfa84a1 Merge branch 'phpng' of git.php.net:php-src into phpng 
* 'phpng' of git.php.net:php-src:
  Fixed getDefaultProperties (it should not return reference)
  Fixed invalid free
  Fixed segfault
 2014-07-31 10:55:39 +04:00
Dmitry Stogov
449f3e6452 Fixed resource leak 2014-07-31 10:53:31 +04:00
Dmitry Stogov
7275306887 Fixed check for eval() 2014-07-31 10:52:48 +04:00
Dmitry Stogov
c201ba8fff execute_data->return_value should be initialized when call internal constructors 2014-07-31 10:51:49 +04:00
Dmitry Stogov
f693cf8e66 EA must be initialized 2014-07-31 10:50:27 +04:00
Xinchen Hui
cf5b3ed31c Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng 2014-07-31 12:57:37 +08:00
Xinchen Hui
be010e26c4 Fixed getDefaultProperties (it should not return reference) 2014-07-31 12:55:53 +08:00
Tjerk Meesters
a41a16c5cd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Moved streams related functions to xp_ssl.c
 2014-07-31 12:18:19 +08:00
Tjerk Meesters
8f345a7148 Moved streams related functions to xp_ssl.c 2014-07-31 12:17:17 +08:00
Keyur Govande
33ce329f57 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
 2014-07-30 18:50:07 +00:00
Keyur Govande
4383ac04a0 Remove duplicate NEWS 2014-07-30 18:48:43 +00:00
Keyur Govande
33c4b9d5a6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Update NEWS
 2014-07-30 18:41:13 +00:00
Keyur Govande
b96224625c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
 2014-07-30 18:39:59 +00:00
Keyur Govande
7b60430a8f Update NEWS 2014-07-30 18:39:23 +00:00
Keyur Govande
752c40d2ec Update NEWS 2014-07-30 18:38:48 +00:00
Keyur Govande
0a29e4731e Update NEWS 2014-07-30 18:33:19 +00:00
Michael Wallner
03f56152e5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:14:40 +02:00
Michael Wallner
b3b25e1b70 BFN 2014-07-30 20:14:03 +02:00
Michael Wallner
ceadf783fe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:13:39 +02:00
Michael Wallner
48cadf242d BFN 2014-07-30 20:13:17 +02:00
Michael Wallner
6ed9991a6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).
 2014-07-30 20:12:50 +02:00
Michael Wallner
12b2127b72 Fixed bug #67715 (php-milter does not build and crashes randomly). 2014-07-30 20:12:13 +02:00
Rasmus Lerdorf
e7d921fd0b Merge commit '8b9719d' 
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
 2014-07-30 12:23:46 -04:00