php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,156 Commits 547 Branches 1,483 Tags
6eb4daabeb69cc426fe2c19c473acb35af05502a
Commit Graph

12409 Commits

Author SHA1 Message Date
Dmitry Stogov
503df277ab Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed indirect modification of magic ArrayAccess method arguments
 2017-10-26 16:04:20 +03:00
Dmitry Stogov
98eee90734 Fixed indirect modification of magic ArrayAccess method arguments 2017-10-26 16:03:42 +03:00
Dmitry Stogov
d3146889ab Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Backport tests
 2017-10-26 14:12:33 +03:00
Dmitry Stogov
502cfddf28 Backport tests 2017-10-26 14:12:08 +03:00
Dmitry Stogov
177cdcf313 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed indirect modification of magic method arguments.
 2017-10-26 13:11:59 +03:00
Dmitry Stogov
bc59289b7a Fixed indirect modification of magic method arguments. 2017-10-26 13:05:23 +03:00
Xinchen Hui
6b637ac589 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-10-26 10:23:52 +08:00
Xinchen Hui
eaeccc1d99 Fixed test 2017-10-26 10:23:43 +08:00
Xinchen Hui
3c4c9a23bc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

Conflicts:
	Zend/zend_object_handlers.c
 2017-10-26 10:08:39 +08:00
Xinchen Hui
d2047503cb Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS) 2017-10-26 10:07:08 +08:00
Dmitry Stogov
bf1c1d07db Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)
 2017-10-13 13:56:23 +03:00
Dmitry Stogov
397f5cb687 Fixed bug #75368 (mmap/munmap trashing on unlucky allocations) 2017-10-13 13:56:06 +03:00
Andrea Faulds
4372293192 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-29 21:38:30 +01:00
Andrea Faulds
abefb6dfe7 Fix bug #75290 2017-09-29 21:38:08 +01:00
Sara Golemon
b5bc88c64e Fix word alignment on ILP64. 2017-09-28 10:45:51 -04:00
Joe Watkins
2dd77456fe Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #75220 - Segfault when calling is_callable on parent
 2017-09-27 06:08:01 +01:00
Nester
a680d701ce Fixed #75220 - Segfault when calling is_callable on parent 2017-09-27 06:07:24 +01:00
Xinchen Hui
e8c200515a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning
 2017-09-24 17:24:23 +08:00
Xinchen Hui
b05ff14a9a Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()). 2017-09-24 17:24:11 +08:00
Nikita Popov
628c257f71 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-24 08:54:36 +02:00
Nikita Popov
73d6456d7d Fixed bug #75252 2017-09-24 08:53:27 +02:00
Dmitry Stogov
c24b3eff11 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Properly update string type flags
 2017-09-13 01:46:12 +03:00
Dmitry Stogov
d7a10f0e32 Properly update string type flags 2017-09-13 01:45:57 +03:00
Dmitry Stogov
5f1d553e7e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Properly update string type flags"
 2017-09-13 00:15:08 +03:00
Dmitry Stogov
83d8ebc991 Revert "Properly update string type flags" 
This reverts commit 99b1a62d55.
 2017-09-13 00:14:39 +03:00
Dmitry Stogov
7452fd0263 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Properly update string type flags
 2017-09-12 23:43:42 +03:00
Dmitry Stogov
99b1a62d55 Properly update string type flags 2017-09-12 23:42:51 +03:00
Remi Collet
42e15813e2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  drop symbol definition, and not defined anywhere
 2017-09-12 13:03:39 +02:00
Remi Collet
35deb4c88b drop symbol definition, and not defined anywhere 2017-09-12 13:03:18 +02:00
Xinchen Hui
58aa726548 Fixed arginfo for get_defined_functions 2017-09-12 13:26:07 +08:00
Sara Golemon
a1573d5620 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add BC define for users of the typoed zend_symbtable_add_new
 2017-09-07 17:36:04 -04:00
Sara Golemon
0413feb29c Add BC define for users of the typoed zend_symbtable_add_new 2017-09-07 17:35:54 -04:00
Sara Golemon
9369843ee2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix typo in zend_symtable_add_new() API name
 2017-09-07 16:26:45 -04:00
Sara Golemon
f18cf46d07 Fix typo in zend_symtable_add_new() API name 2017-09-07 16:25:25 -04:00
Anatol Belski
3069ad8dd1 Fixed bug #75063 2017-08-14 00:44:19 +02:00
Joe Watkins
9c6262f39b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fixed #endif comments
 2017-08-02 08:35:38 +01:00
clwu
b2934d2612 fixed #endif comments 2017-08-02 08:35:27 +01:00
Sara Golemon
b62fb3aa0c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Simpler fix for #74974
 2017-07-27 10:04:14 -04:00
Pedro Magalhães
34e5d3a87d Simpler fix for #74974 2017-07-27 09:25:38 -04:00
Xinchen Hui
0ddda0dcb7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-07-27 12:50:28 +08:00
Xinchen Hui
9fcfe52d03 Fixed test 2017-07-27 12:50:17 +08:00
Sara Golemon
a4e3589966 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use compatability zend_isnan() instead of POSIX isnan()
 2017-07-22 21:33:20 -04:00
Sara Golemon
775b4b54d8 Use compatability zend_isnan() instead of POSIX isnan() 
s/isnan/zend_isnan/g
 2017-07-22 21:32:44 -04:00
Sara Golemon
1229b0f8cb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix compile-time optimization of NAN comparisons
 2017-07-22 21:23:17 -04:00
Sara Golemon
c562d44321 Fix compile-time optimization of NAN comparisons 2017-07-22 21:22:51 -04:00
Bob Weinand
134e713be2 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-22 11:14:54 +02:00
Bob Weinand
bad5d0d6c5 Fixed bug #74954 (null deref and segfault in zend_generator_resume()) 2017-07-22 11:14:00 +02:00
Anatol Belski
4b3ed311aa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move the define into the header to reduce diff for future upgrade
 2017-07-21 11:16:15 +02:00
Anatol Belski
9b3c26d4f4 Move the define into the header to reduce diff for future upgrade 2017-07-21 09:12:06 +02:00
Xinchen Hui
84926a0d71 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c
 2017-07-21 11:58:07 +08:00