Commit Graph

194 Commits

Author SHA1 Message Date
Joe Watkins
8c238c15bc
Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
2017-07-17 06:52:43 +01:00
Joe Watkins
2e82ed9b73
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
2017-07-17 06:51:47 +01:00
Peter Kokot
0db20a7cb1
Fixed bug 74913 redirecting incorrect include <sys/poll.h> 2017-07-17 06:50:59 +01:00
Anatol Belski
c698299550 Interned strings unification for TS/NTS
Hereby, interned strings are supported in thread safe PHP. The patch
implements two types of interned strings

- interning per process, strings are not freed till process end
- interning per request, strings are freed at request end

There is no runtime interning.

With Opcache, all the permanent iterned strings are copied into SHM on
startup, additional copying into SHM might happen on demand.
2017-03-04 10:39:13 +01:00
Joe Watkins
c564924d31
Revert "fix crash in phpdbg shutdown process when opcache is loaded"
This reverts commit 008fb28eaf.
2017-02-27 19:21:10 +00:00
Joe Watkins
61ecad0f53
Merge branch 'PHP-7.1'
* PHP-7.1:
  fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:55:31 +00:00
Joe Watkins
7aa59a4440
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix crash in phpdbg shutdown process when opcache is loaded
2017-02-27 17:55:14 +00:00
Joe Watkins
008fb28eaf
fix crash in phpdbg shutdown process when opcache is loaded 2017-02-27 17:54:48 +00:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Bob Weinand
5d7ce72747 Merge branch 'PHP-7.1' 2016-12-22 00:42:05 +01:00
Bob Weinand
728502fc29 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 00:40:54 +01:00
Bob Weinand
942d4d5614 Merge branch 'PHP-7.1' 2016-12-21 02:43:04 +01:00
Bob Weinand
7e2146293b Merge branch 'PHP-7.0' into PHP-7.1 2016-12-21 02:42:38 +01:00
Bob Weinand
becda86ae5 Fix issue with -- in phpdbg command line 2016-12-21 02:42:23 +01:00
Bob Weinand
e4db84f231 Merge branch 'PHP-7.1' 2016-12-20 19:49:25 +01:00
Bob Weinand
3273f15412 Fix segfault in ZTS mode when just printing and exiting in phpdbg 2016-12-20 19:49:04 +01:00
Nikita Popov
ef1ed6ab8e Merge branch 'PHP-7.1' 2016-12-14 18:11:51 +01:00
Nikita Popov
33e96c9d63 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-14 18:11:43 +01:00
Nikita Popov
f99bf70360 Partially fix bug #70492
The libmagic portion is missing.
2016-12-14 18:11:27 +01:00
Bob Weinand
7631c8766e Merge branch 'PHP-7.1' 2016-11-30 02:57:34 +01:00
Bob Weinand
7aaa1a876e Merge branch 'PHP-7.0' into PHP-7.1 2016-11-30 02:57:16 +01:00
Bob Weinand
b73a3afff3 Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup) 2016-11-30 02:56:47 +01:00
Bob Weinand
e3feeba3ae Merge branch 'PHP-7.1' 2016-11-20 19:20:48 +01:00
Bob Weinand
110a6cc6c0 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 19:20:09 +01:00
Bob Weinand
bc30206b8a Revert "Revert "Remove a few unused write warning""
This reverts commit ff5a65d26b.

(With zend_ prefix now)
2016-11-20 19:18:50 +01:00
Bob Weinand
b7fee22e73 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-20 14:18:54 +01:00
Bob Weinand
c65d24eaa3 Remove a few unused write warning (backport from master, oops)s 2016-11-20 14:17:14 +01:00
Bob Weinand
d37482679a Remove a few unused write warnings 2016-11-20 14:15:02 +01:00
Joe Watkins
893a27d632 make it possible to show specific help pages without interactive session 2016-11-20 05:26:46 +00:00
Joe Watkins
56f9a93939 make it possible to show specific help pages without interactive session 2016-11-20 05:25:42 +00:00
Joe Watkins
7753d10457 make it possible to show specific help pages without interactive session 2016-11-20 05:24:14 +00:00
Bob Weinand
1e65d0ea67 Merge branch 'PHP-7.1' 2016-11-13 12:26:13 +01:00
Bob Weinand
dbd504eaa9 Fix phpdbg ZTS shutdown with USE_ZEND_ALLOC 2016-11-13 12:25:43 +01:00
Joe Watkins
6c7e795c15 phpdbg standard input changes 2016-11-13 08:00:15 +00:00
Anatol Belski
6c55c39d8e Merge branch 'PHP-7.1'
* PHP-7.1:
  yet another uninitialized pointer
2016-10-27 02:46:18 +02:00
Anatol Belski
931ea5c872 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  yet another uninitialized pointer
2016-10-27 02:45:48 +02:00
Anatol Belski
e586c7c612 yet another uninitialized pointer 2016-10-27 02:42:30 +02:00
Anatol Belski
c3f08add5e Merge branch 'PHP-7.1'
* PHP-7.1:
  fix uninitialized pointer
2016-10-27 02:20:35 +02:00
Anatol Belski
4e3eb4a5f8 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix uninitialized pointer
2016-10-27 02:20:12 +02:00
Anatol Belski
b9993c8b6c fix uninitialized pointer 2016-10-27 02:15:14 +02:00
Bob Weinand
efcbeb0603 Merge branch 'PHP-7.1' 2016-10-16 15:46:44 +02:00
Bob Weinand
f8c2089651 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-16 15:46:33 +02:00
Bob Weinand
d82da7de3a Fixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version) 2016-10-16 15:41:37 +02:00
Bob Weinand
b1c6299b34 Merge branch 'PHP-7.1' 2016-10-16 13:48:25 +02:00
Bob Weinand
47bd3d982e Merge branch 'PHP-7.0' into PHP-7.1 2016-10-16 13:48:13 +02:00
Bob Weinand
e93eaee164 Fixed bug #70776 (Simple SIGINT does not have any effect) 2016-10-16 13:47:49 +02:00
Bob Weinand
990e2ce2a0 Ignore non-executable opcodes in line mode of phpdbg_end_oplog()
(cherry picked from commit d14498a475)
2016-10-14 02:03:46 +02:00
Bob Weinand
f40c03168e Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
(cherry picked from commit 457e686262)
2016-10-14 01:54:18 +02:00