php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,672 Commits 547 Branches 1,483 Tags
fec5786f87a904e595d602688b666dbc80f5e1b1
Commit Graph

533 Commits

Author SHA1 Message Date
Remi Collet 2cdde35d0f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix man page installation
 2018-08-16 06:54:57 +02:00
Remi Collet 1f2f2c6b96 fix man page installation 
Since 91996e7ee5
phpdbg.1 is in buildir, not in srcdir
 2018-08-16 06:53:56 +02:00
Peter Kokot 9286681bac Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug 76595: Update phpdbg man page
 2018-08-04 06:35:40 +02:00
Kevin Abel 91996e7ee5 Fix bug 76595: Update phpdbg man page 
Send phpdbg.1 man page through configure replacements
Update phpdbg.1 man page to include all options
Fixes formatting to be more consistent with php.1
Fix paragraph whitespace and ignore phpdbg.1
 2018-08-04 06:34:40 +02:00
Christoph M. Becker 2458dab466 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix arginfo wrt. optional/required parameters
 2018-06-25 11:54:45 +02:00
Christoph M. Becker 6b5597f7d8 Fix arginfo wrt. optional/required parameters 
All parameters of phpdbg_color(), phpdbg_exec() and phpdbg_prompt() are
required.  We mark them as such.
 2018-06-25 11:52:17 +02:00
Thomas Punt 972c4869a7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Allocate default ini values into persistent memory
 2018-04-26 21:09:08 +01:00
Thomas Punt 2513da4b4c Allocate default ini values into persistent memory 2018-04-26 21:08:19 +01:00
Thomas Punt b3fff5fc41 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix memory leak when phpdbg fails to start up
 2018-04-26 16:42:21 +01:00
Thomas Punt 435e812c09 Fix memory leak when phpdbg fails to start up 2018-04-26 16:39:52 +01:00
Xinchen Hui 474895915e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
 2018-04-10 16:32:28 +08:00
Xinchen Hui 8cfb648761 Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite) 2018-04-10 16:32:08 +08:00
Anatol Belski d1ed6b1b15 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Disable PGO for phpdbg
 2018-03-08 11:49:25 +01:00
Anatol Belski 34b9f9dedf Disable PGO for phpdbg 
For executable files, the linker seems to have issues dealing with the
empty profiling database. As PGO is unlikely to bring any benefit in
this case, the easiest is to disable it.
 2018-03-08 11:48:37 +01:00
Xinchen Hui b65abecfdf regenerated with newer re2c 2018-01-02 13:54:29 +08:00
Xinchen Hui 7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Nikita Popov 1310234aa3 Fix printf format issues on i386 2017-11-17 22:25:03 +01:00
Remi Collet d99cd28925 fix tests for 32-bit 2017-09-13 12:20:05 +02:00
Xinchen Hui 463413db53 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c
 2017-07-21 12:02:54 +08:00
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
Dmitry Stogov 27e01cd918 Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs. 2017-05-03 10:01:22 +03:00
Joe Watkins 68b312db7d Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Fixed condition check
  Fixed condition check
  another place
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:07:52 +01:00
Joe Watkins e642375764 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Fixed condition check
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:07:24 +01:00
Joe Watkins e24dcf97f1 Merge branch 'master' of git.php.net:/php-src 
* 'master' of git.php.net:/php-src:
  Fixed condition check
  Fixed condition check
  another place
  Fixed issue #2466 Invalid integer constant expression error in php.h
 2017-04-10 08:06:52 +01:00
Joe Watkins 5b013e7935 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #74400 (phpdbg comparing socket function to int)
 2017-04-10 08:06:28 +01:00
Joe Watkins c961beb5de Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74400 (phpdbg comparing socket function to int)
 2017-04-10 08:06:11 +01:00
Joe Watkins 60b68f19f0 Fixed bug #74400 (phpdbg comparing socket function to int) 2017-04-10 08:05:31 +01:00
Xinchen Hui 696bd37e67 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed condition check
  Fixed condition check
  another place

Conflicts:
	ext/mcrypt/mcrypt.c
 2017-04-10 14:49:13 +08:00
Xinchen Hui 9398f15efd Fixed condition check 2017-04-10 14:48:31 +08:00
Xinchen Hui 65d77812fc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed condition check
 2017-04-10 14:47:42 +08:00
Xinchen Hui 4bebcb84ad Fixed condition check 2017-04-10 14:47:24 +08:00
Sara Golemon 2b86a89193 Update tests and add NEWS entry for phpdbg opcode dump change 2017-03-29 12:54:52 -07:00
Sara Golemon 764b529efd Add extended_value to phpdbg opcode dump 2017-03-29 04:08:52 -07:00
Nikita Popov edcabf6d07 Drop unnecessary allocator return value checks 2017-03-13 22:07:15 +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
Bob Weinand d4dd540233 Merge branch 'PHP-7.1' 2017-01-25 13:01:48 +01:00
Bob Weinand d0272ef1ef Merge branch 'PHP-7.0' into PHP-7.1 2017-01-25 13:01:10 +01:00
Bob Weinand c44efbbbb1 Fix copying too much leading to potential segfault 2017-01-25 13:00:48 +01: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
Anatol Belski afb6ca2566 Finish remaining replacement uint => uint32_t 
Tthe core should be normalized now, no uints anymore
 2016-12-22 14:32:02 +01:00
Bob Weinand 5d7ce72747 Merge branch 'PHP-7.1' 2016-12-22 00:42:05 +01:00