clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-04 00:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,267 Commits 494 Branches 1,367 Tags 814 MiB
3fff53fc57
Commit Graph

79267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julio Pintos
49341e992a Fix #66908: php-fpm reload leaks epoll_create() file descriptor 
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
 2014-04-20 16:21:49 -07:00
Stanislav Malyshev
774f16318b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:27:39 -07:00
Stanislav Malyshev
5addf223d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86 Fix bug #65701: Do not use cache for file file copy 2014-04-20 15:22:44 -07:00
Bob Weinand
577c6ed0ce Fixed stepping 2014-04-20 20:20:59 +02:00
Bob Weinand
422dc49c0d Merge branch 'master' of https://github.com/krakjoe/phpdbg 
Conflicts:
	phpdbg_help.c
	phpdbg_prompt.c
 2014-04-20 19:55:44 +02:00
krakjoe
f96feea00c step by line and opcode modes preserved, set stepping added, help updated 2014-04-20 18:46:35 +01:00
krakjoe
373b9ecd05 rename next to continue, cleanup help 2014-04-20 17:10:52 +01:00
Bob Weinand
56293fc0dd Update help 2014-04-20 16:55:49 +02:00
Bob Weinand
e097919f16 Stepping is now line by line with gdb style command 2014-04-20 16:47:24 +02:00
Bob Weinand
d21d5c98a5 Fixed potential bug in run command 2014-04-20 13:28:11 +02:00
Bob Weinand
5a7497904e Breakpoints now hit only once if line was not switched 2014-04-20 13:25:28 +02:00
Bob Weinand
508c379428 Added error on compile failure in exec cmd 2014-04-20 12:54:50 +02:00
krakjoe
fd74024a49 remove compile command 2014-04-19 21:22:09 +01:00
krakjoe
89868dd4d9 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2014-04-19 21:09:10 +01:00
krakjoe
11c707d836 auto compile when execution context set 2014-04-19 21:08:54 +01:00
Anatol Belski
1bca3ecacc updated libs versions 2014-04-18 16:08:42 +02:00
Anatol Belski
620d7207ef added some notes about the win build system 2014-04-18 16:04:15 +02:00
Anatol Belski
b93d040dc5 UPGRADING note about bug #67072 2014-04-18 15:54:49 +02:00
Anatol Belski
f09f7f22d8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  UPGRADING note about bug #67072
  UPGRADING note about bug #67072
 2014-04-18 15:54:17 +02:00
Anatol Belski
3586d14b61 UPGRADING note about bug #67072 2014-04-18 15:50:15 +02:00
Anatol Belski
fae4f64865 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  UPGRADING note about bug #67072
 2014-04-18 15:44:18 +02:00
Anatol Belski
53c68811ba UPGRADING note about bug #67072 2014-04-18 15:43:05 +02:00
Anatol Belski
cfd20c90a5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  refixed the test related to bug #67072
  Improved the fix for bug #67072, thanks Nikita
 2014-04-18 15:17:12 +02:00
Anatol Belski
d963cf94a5 refixed the test related to bug #67072 2014-04-18 15:16:09 +02:00
Anatol Belski
7c400dc867 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved the fix for bug #67072, thanks Nikita
 2014-04-18 15:14:42 +02:00
Anatol Belski
c2acdbdd3d Improved the fix for bug #67072, thanks Nikita 2014-04-18 15:13:32 +02:00
Stanislav Malyshev
ce4c78dd07 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test case for 5328d42
 2014-04-17 17:36:26 -07:00
Tjerk Meesters
5e988a888a Fixed test case for 5328d42 2014-04-17 17:36:03 -07:00
Bob Weinand
c02003e6b8 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-17 17:23:05 +02:00
Bob Weinand
0ec122b804 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-17 17:21:21 +02:00
Levi Morrison
6e1e98d7b8 These links to ~helly don't work anymore. 2014-04-17 17:20:24 +02:00
Anatol Belski
00bef4b1c7 updated NEWS 2014-04-17 11:08:27 +02:00
Anatol Belski
f9a1eab435 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #67072 Echoing unserialized "SplFileObject" crash
 2014-04-17 11:07:22 +02:00
Anatol Belski
de6f297e7c updated NEWS 2014-04-17 11:06:55 +02:00
Anatol Belski
dc407c2402 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67072 Echoing unserialized "SplFileObject" crash

Conflicts:
	ext/standard/var_unserializer.c
 2014-04-17 11:05:21 +02:00
Anatol Belski
5328d42899 Fixed bug #67072 Echoing unserialized "SplFileObject" crash 
The actual issue lays in the unserializer code which doesn't honor
the unserialize callback. By contrast, the serialize callback is
respected. This leads to the situation that even if a class has
disabled the serialization explicitly, user could still construct
a vulnerable string which would result bad things when trying
to unserialize.

This conserns also the classes implementing Serializable as well
as some core classes disabling serialize/unserialize callbacks
explicitly (PDO, SimpleXML, SplFileInfo and co). As of now, the
flow is first to call the unserialize callback (if available),
then call __wakeup. If the unserialize callback returns with no
success, no object is instantiated. This makes the scheme used
by internal classes effective, to disable unserialize just assign
zend_class_unserialize_deny as callback.
 2014-04-17 10:48:14 +02:00
Bob Weinand
a0ee96289b Commented out a few PHPDBG_IS_QUITTING checks to fix bug 
If it does not work, please revert...
 2014-04-16 20:55:41 +02:00
Bob Weinand
58c3f7e699 command tokens just available at the beginning now 2014-04-16 20:55:29 +02:00
Bob Weinand
2ab2b74af3 Also check for length to not segfault 2014-04-16 20:55:02 +02:00
Anatol Belski
542a7aceb1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated UPGRADING
 2014-04-16 20:49:21 +02:00
Anatol Belski
05dac1d0a5 updated UPGRADING 2014-04-16 20:48:31 +02:00
Anatol Belski
ba03830241 updated UPGRADING 2014-04-16 20:47:17 +02:00
Anatol Belski
9d39177943 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  correct the bug #67081 fix
 2014-04-16 15:08:34 +02:00
Anatol Belski
947b20bc67 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  correct the bug #67081 fix
 2014-04-16 15:08:08 +02:00
Anatol Belski
7a5f1663c6 correct the bug #67081 fix 2014-04-16 15:06:57 +02:00
Anatol Belski
e74a03fa43 updated NEWS 2014-04-16 14:16:36 +02:00
Anatol Belski
801d312507 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
 2014-04-16 14:15:52 +02:00
Anatol Belski
228a3537d3 updated NEWS 2014-04-16 14:15:26 +02:00
Anatol Belski
444690eca8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
 2014-04-16 14:14:52 +02:00