php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-16 20:41:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
107,721 Commits 547 Branches 1,483 Tags
684ce24eecc5afe7ba767e721c29ef3bb191c43c
Commit Graph

107721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Magalhães
13e9a471d7 Fix #76300 - Dont attempt to change visibility of a parent private 2018-06-17 15:53:55 -07:00
Stanislav Malyshev
7d7b7e801e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #76300 - Dont attempt to change visibility of a parent private
 2018-06-17 15:47:06 -07:00
Stanislav Malyshev
671fc2ec55 Merge branch 'pull-request/3233' into PHP-7.2 
* pull-request/3233:
  Fix #76300 - Dont attempt to change visibility of a parent private
 2018-06-17 15:26:42 -07:00
Stanislav Malyshev
5819ff4865 Merge branch 'pull-request/3268' 
* pull-request/3268:
  Sync sysvsem and sysvshm versions in phpinfo
 2018-06-17 14:12:45 -07:00
Stanislav Malyshev
201f440760 Merge branch 'pull-request/3295' 
* pull-request/3295:
  Remove old and unused warnings when building apache
 2018-06-17 14:11:07 -07:00
Stanislav Malyshev
19d5656b1a Merge branch 'pull-request/3307' 
* pull-request/3307:
  Bump snmp extension version to PHP version
 2018-06-17 14:06:40 -07:00
Stanislav Malyshev
d7ed929e1c Merge branch 'pull-request/3296' 
* pull-request/3296:
  Bump fileinfo extension version to PHP release version
 2018-06-17 14:05:01 -07:00
Stanislav Malyshev
0e7460d793 Merge branch 'pull-request/3304' 
* pull-request/3304:
  Bump intl extension version to PHP release version
 2018-06-17 13:54:04 -07:00
Xinchen Hui
77e632d04f only warning when the flag is true 2018-06-17 11:39:08 +08:00
Peter Kokot
be49d61b19 Remove old SVN keywords substitutions 
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 source
code files.
 2018-06-16 13:04:30 +02:00
Peter Kokot
5651b1a7ca Remove Git ident attribute from the iconv extension 2018-06-16 12:49:55 +02:00
Peter Kokot
7bf091c5c2 Remove SVN revision from phar phpinfo output 
The SVN revision was utilized with Subversion. The Git ident
attribute applies only for particular file and since other core
extensions don't output this information anymore this patch
removes it from the phpinfo output to sync and make the phpinfo
core extensions more consistent.
 2018-06-16 12:47:33 +02:00
Nikita Popov
d04917c7b3 Fixed bug #75218 
I've introduced a new CompileError type, from which ParseError
inherits. These errors are not parse errors in the narrow sense
of the term, even though they happen to be generated during
parsing in our implementation. Additionally reusing the ParseError
class for this purpose would change existing error messages (if
the exception is not caught) from a "Fatal error:" to a "Parse
error:" prefix, and also the error kind from E_COMPILE_ERROR to
E_PARSE.
 2018-06-16 12:41:03 +02:00
Peter Kokot
0bd3fecbcb Remove old SVN keywords substitutions from the zip tests 2018-06-16 12:36:00 +02:00
David Carlier
19af5e471f Add NEWS entries 
[ci skip]
 2018-06-16 12:33:28 +02:00
Tom Van Looy
3775bf9351 [ci skip] Mention new hrtime() in NEWS 2018-06-16 12:30:27 +02:00
Peter Kokot
70f41d1d9c Bump snmp extension version to PHP version 
This patch syncs the snmp extension to match it with the PHP release
version.
 2018-06-15 12:55:21 +02:00
Xinchen Hui
35872c0960 Remove assertion 2018-06-15 17:21:59 +08:00
Xinchen Hui
51f6321189 Update NEWS 2018-06-15 16:32:27 +08:00
Xinchen Hui
efcaa37190 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #76477 (Opcache causes empty return value)
 2018-06-15 16:31:58 +08:00
Xinchen Hui
f31ba7cb53 Fixed bug #76477 (Opcache causes empty return value) 2018-06-15 16:31:31 +08:00
Anatol Belski
5334463e6c [ci skip] Update NEWS 2018-06-15 07:30:10 +02:00
Victor Csiky
71c04324b7 Fixe bug #76386 
..that is also a duplicate of #67122
 2018-06-15 07:23:31 +02:00
Peter Kokot
d6ccaef3e6 Bump fileinfo extension version to PHP release version 
To sync core extensions and their versioning more the fileinfo extension
can be versioned same way as PHP releases.
 2018-06-15 00:28:28 +02:00
Peter Kokot
b1767d8a56 Bump intl extension version to PHP release version 
This patch syncs and simplifies the intl core extension versioning
to match the PHP release version.
 2018-06-14 23:35:29 +02:00
Nikita Popov
0b04938c87 Fix unspecialized executor 
If we conditionally fetch a value, we also need to conditionally
free it.
 2018-06-14 23:26:27 +02:00
Stanislav Malyshev
3d16bb5b62 Merge branch 'pull-request/3299' 
* pull-request/3299:
  Bump extension, module and PHP API numbers for 7.3
 2018-06-14 12:30:41 -07:00
Jakub Zelenka
f3ef13e1d6 Bump PHP_JSON_VERSION to 1.7.0 2018-06-14 20:25:59 +01:00
Michael Moravec
a5748cab2e Bump extension, module and PHP API numbers for 7.3 2018-06-14 16:26:13 +02:00
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
Nat Zimmermann
4ac531afb3 Revert braces inside condition 2018-06-13 23:37:14 +01: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
Peter Kokot
97f2ce4031 Fix bug #75481: makedev warning 
To use makedev the sys/sysmacros.h needs to be included on newer
systems.
 2018-06-13 04:36:55 +02: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