clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
93,483 Commits 491 Branches 1,363 Tags 837 MiB
5c4b4d11be
Commit Graph

93483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
5c4b4d11be Added missing semicolon 2016-02-15 16:37:27 +03:00
Stanislav Malyshev
c1355152db More fixing for bug #71540 2016-02-15 01:53:02 -08:00
Stanislav Malyshev
e34a7a1b08 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()

Conflicts:
	ext/xsl/xsltprocessor.c
 2016-02-15 00:09:30 -08:00
Stanislav Malyshev
cf0cf5b507 Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php() 2016-02-15 00:09:09 -08:00
Stanislav Malyshev
c11b23c465 Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php() 2016-02-15 00:08:18 -08:00
Anatol Belski
9b277e6cff Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix dir separator in test
 2016-02-15 09:01:59 +01:00
Anatol Belski
c94ee2e0c8 fix dir separator in test 2016-02-15 09:00:07 +01:00
Anatol Belski
a3927fa7f5 fix dir separator in test 2016-02-15 08:58:20 +01:00
Anatol Belski
53639c44df make sure the tests always uses same tz 2016-02-15 08:38:55 +01:00
Xinchen Hui
afe0ddf6dd 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 news entry
  fix NEWS entry
  update NEWS
  Fix bug #71525
 2016-02-15 15:32:52 +08:00
Anatol Belski
8f5cdca9c4 fixed news entry 2016-02-15 08:27:41 +01:00
Anatol Belski
9746f2e9da Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix NEWS entry
 2016-02-15 08:27:17 +01:00
Xinchen Hui
e917402f05 Fixed typo (I think it should be a typo) 2016-02-15 15:26:44 +08:00
Anatol Belski
199c0ec48d fix NEWS entry 2016-02-15 08:25:23 +01:00
Anatol Belski
e027f16e94 update NEWS 2016-02-15 08:21:46 +01:00
Sean DuBois
f31e0cd334 Fix bug #71525 
timelib_time->timelib_rel_time is mutated by date_modify, and because it is never zero'ed out
it latters causes other date operations to fail (like date_date_set)
 2016-02-15 08:19:07 +01:00
Xinchen Hui
d0649a8441 Update NEWS 2016-02-15 13:24:39 +08:00
Mickaël
0c2e184eac fpm: call zend_signal_init() in child 
This addresses bug #71269.

When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).

This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit fd5a756ad4 which addresses
bug #61083.
 2016-02-15 13:23:37 +08:00
Xinchen Hui
0e363e90a4 Update NEWS 2016-02-15 10:37:37 +08:00
Xinchen Hui
8974e4c781 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Update NEWS: "Fixed bug  #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
  Fix use-after-free of ZCG(cwd) in Zend Optimizer

Conflicts:
	ext/opcache/ZendAccelerator.c
 2016-02-15 10:32:50 +08:00
Xinchen Hui
2b850e1565 Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)" 2016-02-15 10:31:37 +08:00
Xinchen Hui
5e152f54ae Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 
* 'PHP-5.6' of git.php.net:/php-src:
  update NEWS
  Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
  Check length of string before comparing to :memory:
  Fix bounds check in strip_tags()
  Fix test description
  FIx bug #71569
 2016-02-15 10:29:28 +08:00
Anatol Belski
1740648312 updated NEWS 2016-02-14 20:54:13 +01:00
Anatol Belski
aabb6b70c5 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
 2016-02-14 20:53:41 +01:00
Anatol Belski
aa10fc6092 update NEWS 2016-02-14 20:52:47 +01:00
Anatol Belski
724ee19111 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
 2016-02-14 20:49:03 +01:00
Anatol Belski
ce4a2f0fc6 Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug 2016-02-14 20:47:23 +01:00
Anatol Belski
9bef2212aa cleanup duplicated var 2016-02-14 17:20:37 +01:00
Anatol Belski
8289f11390 fix file lists with subdirs passed to EXTENSION() 
The underlying place responsible is the ADD_SOURCES() function. With
this, the calls like

EXTENSION("hello", "sub0/file0.c sub1/file1.c", ...)

are working correctly. Same for

ADD_SOURCES("some/dir", "sub0/file0.c sub1/file1.c", ...)
 2016-02-14 17:15:20 +01:00
Nikita Popov
c9357f82d3 Format string fixes 
Conflicts:
	ext/pgsql/pgsql.c
 2016-02-14 14:45:53 +01:00
Nikita Popov
5983378364 Fix format attributes in ZTS 2016-02-14 14:44:27 +01:00
Nikita Popov
30d5432bfe Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/sqlite3/sqlite3.c
 2016-02-13 18:03:06 +01:00
Nikita Popov
fece24f8f4 Check length of string before comparing to :memory: 2016-02-13 18:01:50 +01:00
Nikita Popov
f43fe8cb4c Merge branch 'PHP-5.6' into PHP-7.0 2016-02-13 17:48:17 +01:00
Nikita Popov
4e0134c661 Fix bounds check in strip_tags() 2016-02-13 17:47:30 +01:00
Nikita Popov
adcdb4f7ba Fix test description 2016-02-13 17:46:24 +01:00
Nikita Popov
7f474086e3 Fix extract() overwriting its own argument 
Already covered by bug46873.phpt under valgrind.
 2016-02-13 17:39:26 +01:00
Nikita Popov
70c8db08c6 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/pdo_mysql/mysql_driver.c
 2016-02-13 15:21:16 +01:00
Nikita Popov
bc419fee5c FIx bug #71569 
convert_to_string() may result in an interned string.
 2016-02-13 15:17:51 +01:00
Nikita Popov
ccc06e252b Forbid yield from in by-reference generators 
The current yield from implementation doesn't support by-ref
yields. It's likely not worthwhile to actually implement this,
but we should at least keep the door open for the future by
issuing a compile error.

Refs bug #71252.
 2016-02-12 17:55:29 +01:00
Nikita Popov
9cebdc5d47 Fix yield-by-ref of constant 
Typo in the condition...
 2016-02-11 16:32:45 +01:00
Nikita Popov
1322672c0b Fix dangling send target when using yield from 
Also drop some unnecessary TRY_DELREFs -- leftovers from the days
when null was refcounted.
 2016-02-11 16:25:16 +01:00
Anatol Belski
95a47ab556 fix version header 2016-02-11 16:23:19 +01:00
Bob Weinand
1a01a5ec83 Fixed inherited functions from unspecified files being included in phpdbg_get_executable() 
See also https://github.com/krakjoe/phpdbg/issues/152
 2016-02-11 06:42:51 +01:00
Nikita Popov
aa3f44a395 Crude generator GC for value/key/retval 
These values remain live after the generator has been closed, so
they are particularly susceptible to leaking cycles.
 2016-02-10 19:03:02 +01:00
Joe Watkins
daf3d0c875 Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-02-10 12:58:19 +00:00
Joe Watkins
3ac63df9bc be more precise about the meaning of -n 2016-02-10 12:57:48 +00:00
Yussuf Khalil
35f6f9b0db Fix use-after-free of ZCG(cwd) in Zend Optimizer 2016-02-10 10:33:57 +01:00
Xinchen Hui
aeb5319336 Update NEWS 2016-02-09 23:36:15 +08:00
Xinchen Hui
33417bf409 Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/zip/php_zip.c
 2016-02-09 23:35:55 +08:00