1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 16:22:37 +01:00
Commit Graph

107632 Commits

Author SHA1 Message Date
Peter Kokot
bbd7b2d0ee Remove old and unused warnings when building apache
The configure script already warns users at the beginning with
unrecognized options warning so additional check is not required. These
sapis were also removed from the PHP core.
2018-06-14 04:45:28 +02:00
Dmitry Stogov
591f4f005d Merge branch 'PHP-7.2'
* PHP-7.2:
  Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)
2018-06-14 02:41:14 +03:00
Dmitry Stogov
dad8bd5851 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)
2018-06-14 02:40:59 +03:00
Dmitry Stogov
11507c0e1b Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer) 2018-06-14 02:38:39 +03:00
Dmitry Stogov
fcfa006a4e Avoid useless stream buffer copying and workaround with chunk_size manipulation. 2018-06-14 02:34:17 +03:00
Nikita Popov
bc56bb847d Merge branch 'PHP-7.2' 2018-06-13 23:48:37 +02:00
Nikita Popov
d04a1e8d70 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-13 23:48:28 +02:00
Nikita Popov
e77077edeb Make $locale parameter to BreakIterator ctors optional
It's documented as such and already accepts null.
2018-06-13 23:47:20 +02:00
Dmitry Stogov
c1ce43d1d2 php_json_escape_string() optimization 2018-06-13 18:26:48 +03:00
Christoph M. Becker
52f92b51aa erealloc() is infallible 2018-06-13 16:10:08 +02:00
Markus Staab
10a9c51942 emalloc never returns null 2018-06-13 16:00:41 +02:00
Peter Kokot
128cd0d0f2 Remove old SVN keywords substitutions from xsl and sockets tests
When the PHP source code was versioned in Subversion, there was
possible to substitute certain keywords such as $Id$ with revision
number, last change time and author name. Such approach is not used
in Git so this patch removes these outdated artifacts from the xsl
and sockets extensions tests files.
2018-06-13 15:56:06 +02:00
Dmitry Stogov
100b4cdabd emalloc() never returns NULL 2018-06-13 12:39:56 +03:00
Xinchen Hui
9465ec4673 Added num_roots to gc_status 2018-06-13 16:41:51 +08:00
Dmitry Stogov
e788e8261e Removed "gc_" prefix. 2018-06-13 11:28:24 +03:00
Dmitry Stogov
2afc83732c Allow access to some garbage collection internals (Benjamin Eberlei) 2018-06-13 11:10:17 +03:00
Xinchen Hui
609385bbf8 Fixed bug #76446 (zend_variables.c:73: zend_string_destroy: Assertion `!(zval_gc_flags((str)->gc)). 2018-06-13 15:06:51 +08:00
Jakub Zelenka
1650e4669d Merge branch 'PHP-7.2' 2018-06-12 18:11:20 +01:00
Jakub Zelenka
dd622f9ca9 Port FPM test 023 and 024 to the new FPM testing 2018-06-12 18:09:27 +01:00
Jakub Zelenka
b2460c9ec2 Merge branch 'PHP-7.2' 2018-06-12 18:04:30 +01:00
Jakub Zelenka
bc58ba750f Merge branch 'PHP-7.1' into PHP-7.2 2018-06-12 18:03:01 +01:00
Jakub Zelenka
ea592e6b6c Rewrite FPM tests 2018-06-12 17:59:28 +01:00
Anatol Belski
0cb6b17b29 [ci skip] Update NEWS 2018-06-12 18:08:24 +02:00
Anatol Belski
548e2a6cd6 Merge branch 'PHP-7.2'
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
2018-06-12 18:08:05 +02:00
Anatol Belski
827cb0484e [ci skip] Update NEWS 2018-06-12 18:07:35 +02:00
Anatol Belski
87cb883563 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  [ci skip] Update NEWS
2018-06-12 18:07:11 +02:00
Anatol Belski
62554efffe [ci skip] Update NEWS 2018-06-12 18:06:41 +02:00
Anatol Belski
c9fc0095ce Merge branch 'PHP-7.2'
* PHP-7.2:
  Fixed bug #76462 Undefined property: DateInterval::$f
2018-06-12 15:31:49 +02:00
Anatol Belski
5f1190684f Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fixed bug #76462 Undefined property: DateInterval::$f
2018-06-12 15:31:01 +02:00
Anatol Belski
7212829435 Fixed bug #76462 Undefined property: DateInterval::$f 2018-06-12 15:30:14 +02:00
Xinchen Hui
1cc9933130 Fixed bug #76463 (var has array key type but not value type) 2018-06-12 20:55:06 +08:00
Tom Van Looy
19d31433dc Enable HRTime on OpenBSD
OpenBSD has clock_gettime() so this will work. They have _POSIX_TIMERS on -1 in
unistd because they don't have per-process timers.
2018-06-12 12:27:48 +02:00
Remi Collet
c5ab9169ce NEWS 2018-06-12 09:36:31 +02:00
Remi Collet
25188727b1 Merge branch 'PHP-7.2'
* PHP-7.2:
  NEWS
  Add OPSYS_CPM constant as documented and to match libzip naming
2018-06-12 09:36:14 +02:00
Remi Collet
eb2a3c6c65 NEWS 2018-06-12 09:35:52 +02:00
Remi Collet
075e685439 Add OPSYS_CPM constant as documented and to match libzip naming 2018-06-12 09:31:41 +02:00
Xinchen Hui
72104d2b6e supplemental fix for bug #76427
there are two parts to make this problem visible , the first is
our new gc new freeing zvals in an opposite direction(compare to 7.2)
the second is zend_object_store_del doesn't check IS_VALID since 7.3
(using assertion instead)
2018-06-12 09:40:34 +08:00
Nikita Popov
f2be6e732a Update data tables for Unicode 11 2018-06-11 20:25:37 +02:00
Nikita Popov
e4e334effb Remove dead code for ADD_STRING/ADD_CHAR optimization
These opcodes don't exist anymore. The modern equivalent would be
the ROPE_* opcodes. However the code would have to be different
anyway.
2018-06-11 20:17:36 +02:00
Anatol Belski
3b07c6cf87 Skip tests when Oniguruma is disabled 2018-06-11 17:44:34 +02:00
Anatol Belski
a34ba6f30c Fix mbstring fallback when --disable-mbregex used 2018-06-11 17:44:34 +02:00
Xinchen Hui
dc99a13fac Correct NEWS 2018-06-11 21:10:13 +08:00
Xinchen Hui
1a952bca22 Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
  Remove inappropriate FreeLibrary calls
  Remove inappropriate FreeLibrary call
  The ZEND_EXTENSION change is merged with xdebug now so we can drop this for master only
  Fixed bug #76443 (php+php_interbase.dll crash on module_shutdown)
2018-06-11 21:01:10 +08:00
Xinchen Hui
ffaee27478 Fixed bug #76427 (Segfault in zend_objects_store_put) 2018-06-11 21:00:38 +08:00
Anatol Belski
b2a200188f Remove inappropriate FreeLibrary calls 2018-06-11 13:53:17 +02:00
Anatol Belski
05e2d3d59d Merge branch 'PHP-7.2'
* PHP-7.2:
  Remove inappropriate FreeLibrary call
2018-06-11 13:51:56 +02:00
Anatol Belski
7dcfa839c9 Remove inappropriate FreeLibrary call 2018-06-11 13:49:42 +02:00
Kalle Sommer Nielsen
dd494a83db The ZEND_EXTENSION change is merged with xdebug now so we can drop this for master only 2018-06-11 13:34:20 +02:00
Kalle Sommer Nielsen
a6b9ddbfe2 Fixed bug #76443 (php+php_interbase.dll crash on module_shutdown) 2018-06-11 11:50:39 +02:00
Peter Kokot
eebad01672 Remove revision from OCI8 extension
The revisions were used in SVN. Other core extensions don't
provide this information in the phpinfo output anymore so
this patch removes it from the OCI8 info output to make it
consistent with other extensions.
2018-06-10 21:22:12 +02:00