clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
96,074 Commits 491 Branches 1,363 Tags 844 MiB
5717faa1e5
Commit Graph

96074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
5717faa1e5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test (keyword is local related)
 2016-05-31 16:56:12 +08:00
Xinchen Hui
47fa763fae Fixed test (keyword is local related) 2016-05-31 16:55:58 +08:00
Xinchen Hui
9bf3b03e73 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Attempt to fix tests fails
 2016-05-31 16:48:33 +08:00
Xinchen Hui
072bc589fc Attempt to fix tests fails 2016-05-31 16:48:19 +08:00
Xinchen Hui
8539c5debf Merge branch 'PHP-7.0' 
* PHP-7.0:
  Re-Fixed bug #72155 (use-after-free caused by get_zval_xmlrpc_type)
  Revert "fix #72155 (use-after-free caused by get_zval_xmlrpc_type)"
 2016-05-31 11:44:33 +08:00
Xinchen Hui
d1dd9b4558 Re-Fixed bug #72155 (use-after-free caused by get_zval_xmlrpc_type) 2016-05-31 11:44:20 +08:00
Xinchen Hui
a811b5e38d Revert "fix #72155 (use-after-free caused by get_zval_xmlrpc_type)" 
This reverts commit 1690dcb827.
 2016-05-31 11:32:09 +08:00
Dmitry Stogov
b111da96d9 Split ZEND_SEND_VAR_NO_REF into ZEND_SEND_VAR_NO_REF and ZEND_SEND_VAR_NO_REF_EX (similar to ZEND_SEND_VAL) and remove ZEND_ARG_* flags. 2016-05-31 04:06:00 +03:00
Dmitry Stogov
f216176bc9 Initialize only the necessary fields. 2016-05-31 00:04:52 +03:00
Anatol Belski
6bd3b8108a Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix condition
 2016-05-30 18:36:06 +02:00
Anatol Belski
2524ab9e67 fix condition 2016-05-30 18:35:14 +02:00
Anatol Belski
c18423ffb5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-05-30 14:10:48 +02:00
Anatol Belski
c101690972 update NEWS 2016-05-30 14:10:27 +02:00
Bob Weinand
9cdcac309e Merge remote-tracking branch 'origin/PHP-7.0' 2016-05-30 13:32:37 +02:00
Bob Weinand
67468fb417 Fixed bug #72284 (phpdbg fatal errors with coverage) 
Cherry-pick of original commits d3371b and 0f20e11 only present in master
 2016-05-30 13:31:17 +02:00
Anatol Belski
38d9b07d74 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix test title
  Add test for bug #72258
  update UPGRADING
  Expose missing flags from libzip at least >= 0.11.x
 2016-05-30 12:50:25 +02:00
Anatol Belski
933d6b188c fix test title 2016-05-30 12:48:00 +02:00
Anatol Belski
97c530fece Add test for bug #72258 2016-05-30 12:47:04 +02:00
Anatol Belski
f6e79af3ef update UPGRADING 2016-05-30 10:32:43 +02:00
Anatol Belski
2c80459c24 Expose missing flags from libzip at least >= 0.11.x 
These are helpful with reading/writing zips containing non UTF-8
filenames to mitigate possibly changed libzip behaviors.

Partial cherry-pick of 893c2405ff
 2016-05-30 10:32:43 +02:00
Anatol Belski
ef2ffda0e4 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update UPGRADING
 2016-05-30 10:31:56 +02:00
Anatol Belski
d0f03042fd update UPGRADING 2016-05-30 10:31:04 +02:00
Anatol Belski
d893f5c2c7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Expose missing flags from libzip at least >= 0.11.x
 2016-05-30 10:22:12 +02:00
Anatol Belski
63595aef3d Expose missing flags from libzip at least >= 0.11.x 
These are helpful with reading/writing zips containing non UTF-8
filenames to mitigate possibly changed libzip behaviors.

Partial cherry-pick of 893c2405ff
 2016-05-30 10:16:12 +02:00
Joe Watkins
9de481fe0d Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix #72155 (use-after-free caused by get_zval_xmlrpc_type)
 2016-05-30 08:57:11 +01:00
Joe Watkins
1690dcb827 fix #72155 (use-after-free caused by get_zval_xmlrpc_type) 2016-05-30 08:56:50 +01:00
Joe Watkins
2a0261d712 Merge branch 'PHP-7.0' 
* PHP-7.0:
  This is exported at implementation site, but no forward declaration can cause compile warnings
 2016-05-29 06:03:33 +01:00
Joe Watkins
0c5bd4d445 This is exported at implementation site, but no forward declaration can cause compile warnings 2016-05-29 06:02:38 +01:00
Nikita Popov
921b3251b3 Fix bug #71604 
Alternatively could throw some kind of uncatchable dummy exception
into the generator. Right now just checking for NULL in two places
seems simpler.
 2016-05-28 14:40:32 +02:00
Nikita Popov
79de9fa4aa Merge branch 'PHP-7.0' 
Conflicts:
	Zend/zend_vm_execute.h
 2016-05-28 13:22:49 +02:00
Nikita Popov
4746e5efcb Forbid "yield from" in force closed generators 
Same check we do for "yield", was missed when "yield from" was
added. We could make this more granular by only forbidding to
actually yield values and still allow something like "yield from []",
but this does not seem worthwhile.
 2016-05-28 13:21:05 +02:00
Xinchen Hui
60a417c5b7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Added NEWS Entry
  Test for bug #72221, segfault in zend_memnstr_ex
  Fix bug #72221 (segfault, past-the-end access)
 2016-05-28 16:12:20 +08:00
Xinchen Hui
d29bd582a8 Added NEWS Entry 2016-05-28 16:12:10 +08:00
Lauri Kenttä
58302192b7 Test for bug #72221, segfault in zend_memnstr_ex 2016-05-28 16:10:29 +08:00
Lauri Kenttä
287f9489d8 Fix bug #72221 (segfault, past-the-end access) 2016-05-28 16:10:16 +08:00
Xinchen Hui
cbe89e2c6e Merge branch 'fix-72221' of https://github.com/Metabolix/php-src 
* 'fix-72221' of https://github.com/Metabolix/php-src:
  Test for bug #72221, segfault in zend_memnstr_ex
  Fix bug #72221 (segfault, past-the-end access)
 2016-05-28 16:09:31 +08:00
Xinchen Hui
c3495d5dc0 This is not a problem here 
if only for PHI placement, we may get rid of this `use` here.
But as the comment said, it is useful if we are going to do code generation
 2016-05-28 15:17:14 +08:00
Xinchen Hui
4935c03276 Revert "assert won't cause indrect var access if it's disabled" 
in the other hand, it should not be there if it's disabled...

This reverts commit 27f40676e6.
 2016-05-27 10:53:32 -07:00
Xinchen Hui
27f40676e6 assert won't cause indrect var access if it's disabled 2016-05-27 10:48:36 -07:00
Xinchen Hui
da511f255a Typo & cleanup 2016-05-27 16:17:07 +08:00
Ferenc Kovacs
42be298b30 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
 2016-05-26 03:06:32 +02:00
Ferenc Kovacs
cc0d237664 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-05-26 03:05:52 +02:00
Ferenc Kovacs
6e5958e37d update NEWS 2016-05-26 03:05:06 +02:00
Anatol Belski
893c2405ff Expose missing flags from libzip at least >= 0.11.x 
These are helpful with reading/writing zips containing non UTF-8
filenames to mitigate possibly changed libzip behaviors.
 2016-05-25 22:13:25 +02:00
Adam Harvey
38be3b28cb Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fix typo in phpdbg help.
 2016-05-25 12:48:00 -05:00
Adam Harvey
c523dfdb49 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix typo in phpdbg help.
 2016-05-25 12:47:49 -05:00
Adam Harvey
54eb659032 Fix typo in phpdbg help. 
Sorry, I would have included this in the last push had I spotted it a
minute earlier.
 2016-05-25 12:47:35 -05:00
Adam Harvey
457d3ad36c Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add missing newlines to phpdbg's help for the run command.
 2016-05-25 12:42:17 -05:00
Adam Harvey
ac29f9de86 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add missing newlines to phpdbg's help for the run command.
 2016-05-25 12:40:23 -05:00
Adam Harvey
e623e91e27 Add missing newlines to phpdbg's help for the run command. 
This is not at all related to needing screenshots for a talk I'm giving
in two days. No sir. Not at all.
 2016-05-25 12:38:41 -05:00