Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: nikic/php-src
base: variadics
...
head fork: nikic/php-src
compare: splat
Checking mergeability… Don’t worry, you can still create the pull request.
This comparison is big! We’re only showing the most recent 250 commits
Commits on Dec 06, 2013
@m6w6 m6w6 fix possibly uninitialized value 098d2a5
@m6w6 m6w6 Fixed bug #61645 (fopen and O_NONBLOCK)
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
b5f5bff
@m6w6 m6w6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
a48d82d
@m6w6 m6w6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
9ea2489
@m6w6 m6w6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
  Use 'user@example.com' rather than 'user@company.com' in tests
01a13bb
@m6w6 m6w6 BFN 51f01a4
@m6w6 m6w6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  BFN
1135f3a
@m6w6 m6w6 Merge branch 'PHP-5.6'
* PHP-5.6:
  BFN
d81d61f
@Tyrael Tyrael Merge branch 'igorw-use-function' into PHP-5.6 9feb87b
@Tyrael Tyrael Merge branch 'PHP-5.6' e3ebe99
@krakjoe krakjoe fix registered commands during init, add test ad2ea99
@krakjoe krakjoe more tests
add phpdbg_exec userland function
faf1013
@krakjoe krakjoe make simple 8939d0d
@philsturgeon philsturgeon Provide commands for getting started 9cd5d75
@philsturgeon philsturgeon Added libedit reference to README 6085597
@philsturgeon philsturgeon Update README.md 39cb92d
Commits on Dec 07, 2013
@felipensp felipensp - Fix compiler warning 6e85e71
@felipensp felipensp - Fix compiler warning + ws 793f1d7
@bwoebi bwoebi Adapted opline_num breakpoints to master branch 50db491
@bwoebi bwoebi Merge branch 'master' of https://github.com/krakjoe/phpdbg into oplin…
…e_num_support

Conflicts:
	phpdbg.c
	phpdbg_bp.c
422f80e
@bwoebi bwoebi Renumbered phpdbg.h correctly 2555fbf
@felipensp felipensp - CS d2ded76
@felipensp felipensp Merge branch 'opline_num_support' of github.com:krakjoe/phpdbg into o…
…pline_num_support
4715988
@bwoebi bwoebi Added mapping... 9cd9356
Commits on Dec 08, 2013
@LawnGnome LawnGnome Switch to using freetype-config for freetype detection.
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.

The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.

Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
a0955f3
@LawnGnome LawnGnome Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Switch to using freetype-config for freetype detection.
d7a45a6
@LawnGnome LawnGnome Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Switch to using freetype-config for freetype detection.
d40a5a2
@kaplanlior kaplanlior Replace invalid code with a proper #error
This code creates a nasty error as mentioned in bugs #31131, #37062
Patch taken from Debian's PHP package: 044-strtod_arm_fix
c062c18
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Replace invalid code with a proper #error
744f35d
@smalyshev smalyshev Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Replace invalid code with a proper #error
cfd5ea4
@LawnGnome LawnGnome Merge branch 'PHP-5.6'
* PHP-5.6:
  Switch to using freetype-config for freetype detection.
b971561
@felipensp felipensp - CS + ws c987e46
@felipensp felipensp - Moved frame related code to phpdbg_frame.c bae424d
@felipensp felipensp - Fixed build 3ec948b
@felipensp felipensp - Change phpdbg_dump_backtrace prototype e5a2d2e
@felipensp felipensp - Splitting prototype dumping code 1fc10b5
@felipensp felipensp - CS 5087728
@felipensp felipensp - Added argument name to backtrace dump 50e8a47
@felipensp felipensp - Fix argname printing order b655a0b
@felipensp felipensp - Added variadic support to prototype dumping cd3b070
@bwoebi bwoebi Renumbered frames in backtrace for internal functions e3bf7ad
@bwoebi bwoebi WS 71ae30f
@bwoebi bwoebi Pssst, compiler! b35f6ee
Commits on Dec 09, 2013
@smalyshev smalyshev Merge branch 'PHP-5.6'
* PHP-5.6:
  Replace invalid code with a proper #error
912be12
@ardbiesheuvel ardbiesheuvel cli: don't cast away const in select() timeout argument
The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]

Fix this by passing a stack copy of the timeout argument to select()
f33265d
@ardbiesheuvel ardbiesheuvel Merge branch 'PHP-5.6' 21fd125
@krakjoe krakjoe remove zend extension 12d071f
@krakjoe krakjoe Merge branch 'master' of https://github.com/krakjoe/phpdbg 64194ef
@krakjoe krakjoe fix test cbaf610
@krakjoe krakjoe update cl 058b59b
@krakjoe krakjoe resolve all warnings af97939
@bwoebi bwoebi Fixed segfault (removed superfluous NUL-byte insertion) 9760491
@felipensp felipensp - Fix compiler warning bba7362
@bwoebi bwoebi Added conditional opline num support 2fa3479
@bwoebi bwoebi Tiny whitespace fix in makefile (aligning with other "Installing" mes…
…sages)
baceff6
Commits on Dec 10, 2013
@dstogov dstogov Arguments passed to user function have to be properly allocated on heap a651665
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Arguments passed to user function have to be properly allocated on heap
5ad1117
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
  Arguments passed to user function have to be properly allocated on heap
6b6a4e4
@dstogov dstogov Fixed bug #66252 (Problems in AST evaluation invalidating valid paren…
…t:: reference. Constant expessions have to be evaluated in context of defining class).
5a87b7f
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class).
b260cb9
@ardbiesheuvel ardbiesheuvel Zend: fix overflow handling bug in non-x86 fast_add_function()
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
60d2e70
@ardbiesheuvel ardbiesheuvel Merge branch 'PHP-5.6' c786c30
@dstogov dstogov Fixed memory leaks introdused by:
	commit 611da37
	Author: Igor Wiedler <igor@wiedler.ch>
	Date:   Sat Nov 9 13:48:23 2013 -0500
49d7e98
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed memory leaks introdused by: 	commit 611da37 	Author: Igor Wiedler <igor@wiedler.ch> 	Date:   Sat Nov 9 13:48:23 2013 -0500
78265a4
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Zend: fix overflow handling bug in non-x86 fast_add_function()
1dafdaa
@dstogov dstogov Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Zend: fix overflow handling bug in non-x86 fast_add_function()
4c3492b
@dstogov dstogov Revered func_get_args() changes, because they were not completly tran…
…sparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
a46f644
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
6eaf57e
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
1e161a9
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
  Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
90c5689
@dstogov dstogov Fixed bug #66251 (Constants get statically bound at compile time when…
… Optimized)
73f13f4
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
d439b39
@dstogov dstogov Fixed bug #66112 (Use after free condition in SOAP extension). (marti…
…n dot koegler at brz dot gv dot at)
552e8b2
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)

Conflicts:
	NEWS
fe93347
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
ad4f0c7
@remicollet remicollet Fixed Bug #66218 zend_register_functions breaks reflection
Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.

Ex: additional_functions from api_module_entry.
Ex: in CLI, dl, cli_set_process_title and cli_get_process_title

Note:
- also affects functions overrided in extension
  (should be be reported in extension, where overrided, not in original extension)
- also allow extension to call zend_register_functions for various list
  (instead of having a single bug list)
3e963f8
@remicollet remicollet Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed Bug #66218 zend_register_functions breaks reflection
9f4d1ee
@remicollet remicollet NEWS bc8f776
@remicollet remicollet Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
45d8802
@remicollet remicollet Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
8e29235
@smalyshev smalyshev Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse

Conflicts:
	configure.in
	main/php_version.h
71daf32
@smalyshev smalyshev Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  Fixed Bug #66218 zend_register_functions breaks reflection
b1b23ab
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
41cd533
@smalyshev smalyshev Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
293984a
@smalyshev smalyshev Merge branch 'PHP-5.6'
* PHP-5.6:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
35b8f57
@smalyshev smalyshev Fix CVE-2013-6420 - memory corruption in openssl_x509_parse c122457
@smalyshev smalyshev 5.3.29-dev 8650bbc
Commits on Dec 11, 2013
@ardbiesheuvel ardbiesheuvel Zend: fix overflow handling bug in non-x86 fast_add_function()
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
8f1fee6
@ardbiesheuvel ardbiesheuvel Merge branch 'PHP-5.4' into PHP-5.5 bec62af
@ardbiesheuvel ardbiesheuvel Merge branch 'PHP-5.5' into PHP-5.6 d6ecc41
@ardbiesheuvel ardbiesheuvel Merge branch 'PHP-5.6' 9a5944d
@weltling weltling Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix dir separator in cve-2013-6420 test
ff89066
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix dir separator in cve-2013-6420 test
b6bcae5
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separator in cve-2013-6420 test
e9efc16
@weltling weltling Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dir separator in cve-2013-6420 test
2f707bf
@weltling weltling added missing prototype edf601a
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added missing prototype
f0cf312
@weltling weltling Merge branch 'PHP-5.6'
* PHP-5.6:
  added missing prototype
fa18023
@bwoebi bwoebi Added one more test for constant scalar expressions 324291e
@bwoebi bwoebi Merge branch 'PHP-5.6'
* PHP-5.6:
  Added one more test for constant scalar expressions
98d9292
@weltling weltling fix dir separator in cve-2013-6420 test 6f73931
Commits on Dec 12, 2013
@dstogov dstogov Fixed ext/soap/tests/bugs/bug54911.phpt 1886292
@weltling weltling Fixed bug #65486 mysqli_poll() is broken on Win x64
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.

Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
da62fd5
@dstogov dstogov Fixed tests 0344e6a
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
39a2dcd
@weltling weltling Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
58b754c
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
9850d57
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
8738e6d
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
a23bcba
@dstogov dstogov Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
463dbc3
@dstogov dstogov Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
47f4138
@m6w6 m6w6 remove always_populate_raw_post_data INI entries from master, UPGRADI…
…NG.INTERNALS coming shortly
bc1c2b3
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  remove always_populate_raw_post_data INI entries from master, UPGRADING.INTERNALS coming shortly
9d08f09
@m6w6 m6w6 fix test c59f318
@m6w6 m6w6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test
8ee6fe9
@m6w6 m6w6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
1dfbe99
@m6w6 m6w6 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix test
c0e87e9
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix test
fd4a738
@dstogov dstogov Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  fix test
3bddcc1
@dstogov dstogov Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  fix test
711d8c2
@laruence laruence Merge branch 'PHP-5.6' 0fbb421
@laruence laruence Fixed bug #65784 (Segfault with finally). 794a888
@jpauli jpauli Update NEWS for 5.5.7 release 3248b3c
@laruence laruence Merge branch 'PHP-5.6'
Conflicts:
	NEWS
6a29951
@laruence laruence Disallowed JMP into a finally block. 54213b4
@laruence laruence Add Tests for #65784 in 5.5 dde552f
@laruence laruence Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 ab12ccd
@laruence laruence Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 c9d00a2
@laruence laruence Merge remote-tracking branch 'origin/PHP-5.6' 8708b13
@KalleZ KalleZ Fix build 4411641
@KalleZ KalleZ Eliminate another straight forward TSRMLS_FETCH() in zend_startup_mod…
…ule()

# For THTTPD:
# The code that uses a call to this function is for older versions of PHP anyway so its not covered

# For Zend OpCache:
# Added a new define for 5.6 and wrapped the code around that so its still compatible with older version
0fc8e6a
@KalleZ KalleZ Kill another TSRMLS_FETCH() in zend_indent() 1433dec
Christopher Jones OCI8 build change: Fix source variable definition for C89 compatibility bc748ba
Christopher Jones Merge branch 'PHP-5.6'
* PHP-5.6:
  OCI8 build change: Fix source variable definition for C89 compatibility
e92ea13
Commits on Dec 13, 2013
@laruence laruence Use zend_error_noreturn here ef73f85
@laruence laruence Merge branch 'PHP-5.5' into PHP-5.6 6f95a07
@laruence laruence Merge branch 'PHP-5.6' 914de05
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Kill another TSRMLS_FETCH() in zend_indent()
  Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
  Fix build
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
9b829c9
@dstogov dstogov Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Use zend_error_noreturn here
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
e6dbf0e
@dstogov dstogov Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
af66b20
@jpauli jpauli Updated release process 3eb2b1a
@jpauli jpauli Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Updated release process
cbc98df
@jpauli jpauli Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Updated release process
47a0722
@jpauli jpauli Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated release process
d67fbaa
@jpauli jpauli Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated release process
735f930
@laruence laruence Test pushing 41eaac3
Eric Stenson Fix tests expecting specific resource IDs
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
50377b5
@DQNEO DQNEO Fix doc (svn -> git) 1b3e2c2
Commits on Dec 14, 2013
@weltling weltling fixed parameter order for zend_throw_exception_ex call 68a73ce
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
509a67d
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
9047211
@weltling weltling Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
fc4761a
Commits on Dec 15, 2013
@laruence laruence Merge branch 'issue-phpt-resourceid-wincache' of https://github.com/E… 304d979
Eric Stenson Fix tests expecting specific resource IDs
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
330168a
@laruence laruence Merge branch 'PHP-5.5' into PHP-5.6 10964b7
@laruence laruence Merge branch 'PHP-5.6' 48dcc43
@laruence laruence Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5 7cf6f01
@laruence laruence Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 5eb8d9d
Commits on Dec 16, 2013
@dstogov dstogov Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Fix tests expecting specific resource IDs
  Test pushing
  Updated release process
82d67af
@dstogov dstogov Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
  Updated release process
43f1116
@dstogov dstogov Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Updated release process
a67c615
@dsp dsp Merge branch 'PHP-5.5' into PHP-5.6 85a1016
@dsp dsp Merge branch 'PHP-5.6' d7d0ceb
@smalyshev smalyshev Fix bug #65873 - Integer overflow in exif_read_data() cbcf6e1
@smalyshev smalyshev Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #65873 - Integer overflow in exif_read_data()
57408f9
@smalyshev smalyshev Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #65873 - Integer overflow in exif_read_data()
de4a2c3
@smalyshev smalyshev Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #65873 - Integer overflow in exif_read_data()
5613d70
Commits on Dec 17, 2013
@laruence laruence Fixed test failed after rev 57c1335 143ae34
@laruence laruence Merge branch 'PHP-5.6' ac71961
@laruence laruence Save one char compare eeb37c4
@laruence laruence Merge branch 'PHP-5.6' a9c503b
@laruence laruence Use memcmp here is better b331a21
@laruence laruence Merge branch 'PHP-5.6' 72389dd
@weltling weltling fixed possibly uninitialized value usage 2303d0e
@weltling weltling Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed possibly uninitialized value usage
5e5ecae
@weltling weltling Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed possibly uninitialized value usage
beed288
@weltling weltling Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed possibly uninitialized value usage
c0f1e69
Commits on Dec 18, 2013
@KalleZ KalleZ Eliminate another TSRMLS_FETCH() in i_zend_is_true()
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
d14670c
@KalleZ KalleZ Merge branch 'master' of https://git.php.net/push/php-src 2eb9bd3
@KalleZ KalleZ Kill another TSRMLS_FETCH() in the zend extension loading code bd58146
@KalleZ KalleZ Kill yet another TSRMLS_FETCH() inside the CLI HTTP server e6b4719
@KalleZ KalleZ Bump year
# Wonder if this is even working anymore
432e91f
@krakjoe krakjoe fix crash on clean in nts 64dabff
@KalleZ KalleZ Fix these SAPI hooks so that the TSRMLS parameters are correctly pass…
…ed as required by the sapi struct

# Not sure if this builds either
520d969
@KalleZ KalleZ Kill another TSRMLS_FECH() in sapi/roxen f70f89c
@KalleZ KalleZ Pass the TSRMLS parameters to the sapi flush hook, this shaves off a …
…few TSRMLS_FETCH() calls in our various SAPIs
ed5a8d5
@KalleZ KalleZ We might as well re-use the TSRMLS parameters here as they are availa…
…ble in PHP_FUNCTION anyway to save a TSRMLS_FETCH() call
f883d3c
@KalleZ KalleZ Kill a TSRMLS_FETCH() call in sapi/caudium d02340b
@KalleZ KalleZ Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_C…
…C to it

# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
c835981
@KalleZ KalleZ Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook aed4b08
@bwoebi bwoebi Added myself as author where I was not author yet 94d5334
@krakjoe krakjoe fix build error zts ef89fe3
@bwoebi bwoebi Merge branch 'master' of https://github.com/krakjoe/phpdbg 3043bd2
@krakjoe krakjoe fix build db9bbf1
@krakjoe krakjoe Merge branch 'master' of https://github.com/krakjoe/phpdbg 8b0e1c6
@krakjoe krakjoe 50700 change 6ac3a4a
@krakjoe krakjoe ... 5cc9a35
@felipensp felipensp - Fixed build a8a36b7
@krakjoe krakjoe fix warnings/50700 stuff 7e0d193
@Hywan Hywan In english, no horizontal space before “!”. e5263aa
@krakjoe krakjoe Merge pull request #40 from Hywan/fix_typo
In english, no horizontal space before “!”
5ccd573
@krakjoe krakjoe ... fc5f533
@Hywan Hywan Add the `-V` option to print the version number. abf68be
@bwoebi bwoebi Merge pull request #43 from Hywan/option_version
Add the `-V` option to print the version number
117d5e3
@Hywan Hywan Add Zend version and copyright. 1bc35a7
@dstogov dstogov Fixed reavlidate_path=1 behavior to avoid caching of symlinks values. 16e95d9
@bwoebi bwoebi Merge pull request #44 from Hywan/option_zend_version
Add Zend version and copyright (oops, I merged the last PR too early)
d850dec
@dstogov dstogov Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
	NEWS
436ca2d
@dstogov dstogov Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
26096aa
@bwoebi bwoebi Fixed ZTS build. Needed to bump API version number. b11b3d2
@krakjoe krakjoe version in userland 944ebb3
@krakjoe krakjoe disregard leading slash 08393ad
Commits on Dec 19, 2013
@m6w6 m6w6 Update NEWS handling section of README.GIT-RULES 3624a9c
@m6w6 m6w6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Update NEWS handling section of README.GIT-RULES
391fe52
@m6w6 m6w6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS handling section of README.GIT-RULES
17470df
@krakjoe krakjoe test commit ce4ba54
@m6w6 m6w6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update NEWS handling section of README.GIT-RULES
5515692
@remicollet remicollet Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real) 20eb8e4
@remicollet remicollet Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
32d1d5f
@remicollet remicollet Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
99b91f9
@remicollet remicollet save a few memory f6ffecb
@remicollet remicollet NEWS eda1cec
@remicollet remicollet Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
0fe9a90
@remicollet remicollet Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  save a few memory
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
e75b967
@derickr derickr - Updated to version 2013.9 (2013i) e881334
@derickr derickr Merge branch 'PHP-5.4' into PHP-5.5 7a402ca
@derickr derickr Merge branch 'PHP-5.5' e1a5eda
@derickr derickr Merge branch 'PHP-5.5' into PHP-5.6 d4f4b66
@derickr derickr Merge branch 'PHP-5.6' db025b3
Boris Lytochkin Fixed SNMP_ERR_TOOBIG handling for bulk walk operations bb51d0e
Boris Lytochkin Merge branch '5.4' into 5.5
* 5.4:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
b65bd30
Boris Lytochkin Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytoc…
…hkin)
324eb07
Boris Lytochkin Merge branch '5.5' into 5.6
* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
285c0bc
Boris Lytochkin Merge branch '5.6'
* 5.6:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
ba51a37
Boris Lytochkin Merge branch '5.6' into PHP-5.6
* 5.6:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
5ce843a
Commits on Dec 20, 2013
@krakjoe krakjoe tidy up repository for merging 329e16a
@krakjoe krakjoe tidy up readme d5c685a
@bwoebi bwoebi Recreated test.php 937cc7c
@bwoebi bwoebi Bumped version number to 0.3.0 f06ac6a
@krakjoe krakjoe update readme 37eac64
@krakjoe krakjoe Merge branch 'master' of https://github.com/krakjoe/phpdbg ef3e011
@bwoebi bwoebi Merge branch 'master' of sapi/phpdbg into PHP-5.6
Including phpdbg.
cee72c1
@bwoebi bwoebi Merge branch 'PHP-5.6' of http://git.php.net/repository/php-src into …
…PHP-5.6
4ae4b7b
@bwoebi bwoebi Merge branch 'PHP-5.6' f500be8
@bwoebi bwoebi Merge branch 'master' of https://git.php.net/push/php-src 3926362
@bwoebi bwoebi Added NEWS and UPGRADING info for phpdbg 6c5e93f
Christopher Jones Align 'configure --help' columns 794df91
Christopher Jones Merge branch 'PHP-5.6'
* PHP-5.6:
  Align 'configure --help' columns
  Added NEWS and UPGRADING info for phpdbg
1b1b706
Commits on Dec 21, 2013
@nikic Minor cleanup in zend_do_pass_param() b72113f
@nikic Implement argument unpacking 44708fa