php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,960 Commits 549 Branches 1,485 Tags
c2bfdf3712ffa1764d539e668fcbb55280267c60
Commit Graph

12397 Commits

Author SHA1 Message Date
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
Xinchen Hui 95d2908814 Fixed bug #74947 (Segfault in scanner on INF number) 2017-07-21 11:56:49 +08:00
Stanislav Malyshev 0ba04f7737 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 21:18:10 -07:00
Stanislav Malyshev 0525574913 Fix bug #74603 - use correct buffer size 2017-07-04 19:35:56 -07:00
Anatol Belski 9d1575c495 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  yet one C++ compat fix
 2017-07-01 20:06:39 +02:00
Anatol Belski d0b7eed0c9 yet one C++ compat fix 2017-07-01 20:05:11 +02:00
Anatol Belski 667185a264 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix C++ compat
 2017-07-01 18:38:18 +02:00
Anatol Belski c71b773a62 fix C++ compat 2017-07-01 18:36:43 +02:00
Bob Weinand af7bfc71fd Merge branch 'PHP-7.0' into PHP-7.1 2017-07-01 11:52:41 +02:00
Bob Weinand e3cc15daf2 Fixed bug #74840 (Opcache overwrites argument of GENERATOR_RETURN within finally) 2017-07-01 11:52:03 +02:00
Julien Pauli e57fce4d00 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Updated NEWS
  Fix bug #74832, crash in extension loading
 2017-06-29 20:24:03 +02:00
Julien Pauli 3f4340a796 Fix bug #74832, crash in extension loading 2017-06-29 20:22:21 +02:00
Nikita Popov 653b96347c Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 19:49:11 +02:00