diff options
| author | Christopher Jones <sixd@php.net> | 2013-10-04 10:51:36 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-10-04 10:51:36 -0700 |
| commit | 1fee78e4659f997459fad221eff7d7c94a9c7150 (patch) | |
| tree | a1c92e3c5c9f1c229692d5f4c89942d7aff76001 /main/php_ini.c | |
| parent | 27d46a44541a9cce7b49d7c64678593a834b77c4 (diff) | |
| parent | 44a2ae059ebbd1068ac09d5705e1debdc3c0144e (diff) | |
| download | php-git-1fee78e4659f997459fad221eff7d7c94a9c7150.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Fix bug #65667: ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions