php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
94,331 Commits 549 Branches 1,484 Tags
7a86bbc79d23de69c1ebc5480104e7599ebb63ac
Commit Graph

94331 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski 7a86bbc79d Merge branch 'PHP-7.0' 
* PHP-7.0:
  refix bug #69111, crash in 5.6 only
 2016-01-29 11:25:51 +01:00
Anatol Belski cb6d045d11 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  refix bug #69111, crash in 5.6 only
 2016-01-29 11:25:32 +01:00
Anatol Belski 25108babdb refix bug #69111, crash in 5.6 only 2016-01-29 11:24:19 +01:00
Anatol Belski e14e177ca7 update NEWS 2016-01-29 11:11:53 +01:00
Remi Collet e846801c79 Merge branch 'PHP-7.0' 
* PHP-7.0:
  NEWS
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
 2016-01-29 10:24:58 +01:00
Remi Collet 83947f4282 NEWS 2016-01-29 10:24:40 +01:00
Remi Collet c0802af52c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  NEWS
  Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
 2016-01-29 10:24:15 +01:00
Remi Collet a81cb64a96 NEWS 2016-01-29 10:23:42 +01:00
Remi Collet 07d2dcdf09 Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup 
Only needed with Apache version < 2.4.12 (ex RHEL-7)
 2016-01-29 10:20:42 +01:00
Anatol Belski f5aea18252 Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  update NEWS
 2016-01-29 08:43:42 +01:00
Anatol Belski 9599acdef6 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-01-29 08:43:13 +01:00
Anatol Belski d77b28507c update NEWS 2016-01-29 08:42:54 +01:00
Anatol Belski 8ee1ae9748 update NEWS 2016-01-29 08:41:25 +01:00
Anatol Belski 46964ac231 Merge branch 'PHP-7.0' 
* PHP-7.0:
  reset ext/session to the state of 7.0.2
  reset the ext/session to the state of 5.6.17
 2016-01-29 08:39:23 +01:00
Anatol Belski b858224b88 reset ext/session to the state of 7.0.2 2016-01-29 08:37:27 +01:00
Anatol Belski 74e51b3513 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  reset the ext/session to the state of 5.6.17
 2016-01-29 08:37:05 +01:00
Anatol Belski ae6e139c77 reset the ext/session to the state of 5.6.17 2016-01-29 08:33:09 +01:00
Andrea Faulds 1b36037689 Test for void 2016-01-28 18:07:45 +00:00
Andrea Faulds 8412de9da5 Support void return type in reflection 2016-01-28 18:01:48 +00:00
Dmitry Stogov 86f54fcdf7 Use special type IS_ERROR instread of EG(error_zval). (we still need EG(error_zval) for SPL support). 2016-01-28 18:00:06 +03:00
Dmitry Stogov e99fe9865e Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71474 (Crash because of VM stack corruption on Magento2).
 2016-01-28 11:54:48 +03:00
Dmitry Stogov 6039d2d914 Fixed bug #71474 (Crash because of VM stack corruption on Magento2). 2016-01-28 11:41:15 +03:00
Yasuo Ohgaki 99101ba310 Update error message. Missed to include in previous commit 46d4a37105 2016-01-28 15:06:55 +09:00
Mikko 46d4a37105 Session regenerate id seems to malfunction with 3rd party session handlers 
Fixed bug #71472 session_regenerate_id malfunctions with certain session handlers
 2016-01-28 13:30:10 +09:00
Stanislav Malyshev 8bc89942bb Merge branch 'PHP-7.0' 
* PHP-7.0:
  Use safe alloc functions when calculations are made on sizes.
 2016-01-26 22:55:20 -08:00
Stanislav Malyshev 88bd7cb418 Use safe alloc functions when calculations are made on sizes. 
Fixes bug #71449, bug #71450
 2016-01-26 22:33:51 -08:00
Anatol Belski af7174f05b fix typo 2016-01-26 16:41:00 +01:00
Xinchen Hui e1d0738534 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)
 2016-01-26 16:22:55 +08:00
Xinchen Hui 6239e4410d Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled) 2016-01-26 16:22:31 +08:00
Xinchen Hui 7b32ec1671 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Added test for bug #71443
 2016-01-26 15:59:32 +08:00
Xinchen Hui bdbb32158c Added test for bug #71443 2016-01-26 15:59:18 +08:00
Xinchen Hui 7df2190f13 Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
  add note on readline support
  check for NULL and avoid crashes
 2016-01-26 15:58:14 +08:00
Xinchen Hui c58ad955a9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
  Fix memory leak with not freeing OpenSSL errors
  check for NULL and avoid crashes
  Update libmagic.patch for PHP-5.6
  Fixed bug #7143	(finfo throws notice for specific python file)
 2016-01-26 15:57:49 +08:00
Xinchen Hui 9ff08ae17c Fixed bug #71443 (Segfault using built-in webserver with intl using symfony) 2016-01-26 15:57:39 +08:00
Anatol Belski 9a33f6583b add note on readline support 2016-01-26 08:55:49 +01:00
Jakub Zelenka 7159f16321 Merge branch 'PHP-7.0' 2016-01-25 17:20:05 +00:00
Jakub Zelenka 67c1921e2b Merge branch 'PHP-5.6' into PHP-7.0 2016-01-25 17:19:18 +00:00
Jakub Zelenka a63d0f55da Fix memory leak with not freeing OpenSSL errors 2016-01-25 16:50:16 +00:00
Antony Dovgal c140bbb5db check for NULL and avoid crashes 2016-01-25 14:30:33 +03:00
Antony Dovgal 52d89557f3 check for NULL and avoid crashes 2016-01-25 14:29:51 +03:00
Xinchen Hui 63fb2b7118 Improve the names 2016-01-25 16:00:10 +08:00
Xinchen Hui 506d5fe4df Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71442 (forward_static_call crash)
 2016-01-25 12:13:35 +08:00
Xinchen Hui e7f2c5bd6a Fixed bug #71442 (forward_static_call crash) 2016-01-25 12:13:22 +08:00
Xinchen Hui d46b23a650 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update libmagic.patch for PHP-7.0
  Fixed compiler warnings
  Fixed bug #71434 (finfo throws notice for specific python file)
 2016-01-25 11:46:42 +08:00
Xinchen Hui b68d525f16 Update libmagic.patch for PHP-7.0 2016-01-25 11:45:32 +08:00
Xinchen Hui 4cb47bd3bd Fixed compiler warnings 2016-01-25 11:45:14 +08:00
Xinchen Hui da7f42de38 Fixed bug #71434 (finfo throws notice for specific python file) 2016-01-25 11:40:08 +08:00
Xinchen Hui 47e7662a13 Update libmagic.patch for PHP-5.6 2016-01-25 11:25:04 +08:00
Xinchen Hui a458a4fdc1 Fixed bug #7143 (finfo throws notice for specific python file) 
There seems be a bug while it was changed from regexec to
preg_match_impl:
https://github.com/php/php-src/commit/46906925#diff-56e765972d18c84894ea061cfe58076aR1757
 2016-01-25 11:24:44 +08:00
Nikita Popov 319e82838a Remove dead code 
OP_DATA isn't used in that way anymore
 2016-01-24 23:04:15 +01:00