php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,195 Commits 549 Branches 1,485 Tags
3efea8aed28d57a9f64495febb0482232e6ee464
Commit Graph

4317 Commits

Author SHA1 Message Date
Bob Weinand d7474e13bd Merge branch 'PHP-7.1' 2016-10-06 10:36:40 +02:00
Bob Weinand c9d3b9fb47 Use better fix for preventing too early freeing of interned strings 
Works also with opcache now - just prevent zend_interned_strings_restore completely - zend_interned_strings_dtor will take care as phpdbg only ever uses one single request cycle per module cycle
 2016-10-06 10:36:25 +02:00
Bob Weinand 38beb0e8d8 Merge branch 'PHP-7.1' 2016-10-05 12:22:39 +02:00
Bob Weinand abfd811ea4 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-05 12:20:06 +02:00
Bob Weinand 4790da5475 Update run command for allowing STDIN 2016-10-05 12:14:02 +02:00
Bob Weinand eaff72f31b Remove phpdbg fix targeting 7.1 which landed in 7.0 2016-10-05 12:08:20 +02:00
Bob Weinand 007cf7d7d3 Merge branch 'PHP-7.1' 2016-10-03 12:55:45 +02:00
Bob Weinand 8fcc938e56 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-03 12:55:23 +02:00
Bob Weinand 8908df690f Fix crash on Linux due to double fclose() 2016-10-03 12:55:06 +02:00
Bob Weinand 29941e1811 Merge branch 'PHP-7.1' 2016-10-02 12:46:45 +01:00
Bob Weinand f58cf8b24d Merge branch 'PHP-7.0' into PHP-7.1 2016-10-02 12:46:22 +01:00
Bob Weinand 417a8ef6b4 Fix run command args passing when inmidst execution 2016-10-02 12:45:20 +01:00
Bob Weinand 1c74398520 Merge branch 'PHP-7.1' 2016-10-01 19:14:46 +01:00
Bob Weinand 3fe1010cee Merge branch 'PHP-7.0' into PHP-7.1 2016-10-01 19:14:26 +01:00
Bob Weinand 9d537951c5 Add proper escape sequences and reading stdin from file in phpdbg run command 2016-10-01 19:05:19 +01:00
Bob Weinand 948c1a912a Merge branch 'PHP-7.1' 2016-10-01 10:47:53 +01:00
Bob Weinand a5129bcb5b Merge branch 'PHP-7.0' into PHP-7.1 2016-10-01 10:47:31 +01:00
Bob Weinand 3280a29ee5 Fix invalid access to interned strings after they are freed in phpdbg 2016-10-01 10:46:21 +01:00
Bob Weinand b1a1902a0f Merge branch 'PHP-7.1' 2016-09-28 13:26:49 +02:00
Bob Weinand e5d75d7268 Add phpdbg generator command 2016-09-28 13:26:08 +02:00
Julien Pauli 983f1e3618 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap
 2016-09-23 13:54:46 +02:00
Julien Pauli 974ba6be7a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap

Conflicts:
	sapi/fpm/fpm/fpm_scoreboard.c
 2016-09-23 13:54:22 +02:00
Julien Pauli fbf87a8082 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap
 2016-09-23 13:53:22 +02:00
Julien Pauli a22175b06f Formatting. Fix possible memory corruption in FPM SHM management 2016-09-23 13:52:58 +02:00
tom916 807004a446 fix every work call mmap 
fix fpm_scoreboard_free
 2016-09-23 13:52:58 +02:00
Anatol Belski 8f256bebef Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  phpdbg next command must stop when leaving function
 2016-09-23 11:25:33 +02:00
Bob Weinand a137a1e255 Merge branch 'PHP-7.0' 2016-09-23 03:29:56 +02:00
Bob Weinand cf35dae6e2 phpdbg next command must stop when leaving function 2016-09-23 03:29:37 +02:00
George Wang 6f7479251b Merge branch 'PHP-7.1' 2016-09-19 10:52:58 -04:00
George Wang 248ef30abe Merge branch 'PHP-7.0' into PHP-7.1 2016-09-19 10:50:21 -04:00
George Wang ca24c58e65 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-19 10:49:26 -04:00
George Wang 56fa36b0a8 Fix wrong year in previous commit. 2016-09-19 10:46:46 -04:00
Anatol Belski b1f33db39f backport 59444347 and 3d7343f6 2016-09-08 17:46:53 +02:00
Stanislav Malyshev 013425fa37 Merge branch 'PHP-7.1' 
* PHP-7.1:
  phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
 2016-09-04 23:24:36 -07:00
Stanislav Malyshev 8c16f2262f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
 2016-09-04 23:24:31 -07:00
David Carlier 19350b6b73 phpdbg: couple of network function return checks. Possible 
overflow when copy the socket_path configuration.
 2016-09-04 23:18:51 -07:00
Nikita Popov 57180cd306 Merge branch 'PHP-7.1' 2016-09-03 23:31:20 +02:00
Nikita Popov f1bfd7fe00 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-03 23:31:05 +02:00
Nikita Popov 1ae2d074f8 Fix bug #72996 2016-09-03 23:30:23 +02:00
Anatol Belski 3e938cd8a9 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix dealloc mismatch
 2016-08-29 13:49:20 +02:00
Anatol Belski 0e709fe42d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix dealloc mismatch
 2016-08-29 13:43:08 +02:00
Anatol Belski eac7f4b670 fix dealloc mismatch 2016-08-29 12:46:23 +02:00
George Wang 698b88fb17 Merge branch 'PHP-7.1' 2016-08-28 22:32:42 -04:00
George Wang 0a09eecfcc code cleanup. 2016-08-28 22:31:08 -04:00
George Wang 413bd261ec Merge branch 'PHP-7.0' into PHP-7.1 2016-08-28 22:29:38 -04:00
George Wang ca1eb585ee Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2016-08-28 22:23:28 -04:00
George Wang c73bcbefbd Added .user.ini support. 
Added LSPHPRC support.
update LiteSpeed SAPI version to 6.10 .
 2016-08-28 21:49:30 -04:00
Sara Golemon fd8e203fa2 Add .gitignore for fpm generated files 2016-08-21 12:53:01 -07:00
Stanislav Malyshev d6a43a8562 Fix bug #72836 - integer overflow in base64_decode caused heap corruption 2016-08-16 22:55:41 -07:00
Matthias Endler ad8b99c888 Fix some typos in PHP FPM configuration 
[skip ci]
 2016-08-15 22:50:14 +02:00