]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 29 Jan 2015 18:05:02 +0000 (21:05 +0300)]
Reimplement iteration magic with HashTableIterators (see https://wiki.php.net/rfc/php7_foreach#implementation_details)
Dmitry Stogov [Thu, 29 Jan 2015 18:04:44 +0000 (21:04 +0300)]
New test
Dmitry Stogov [Thu, 29 Jan 2015 05:26:52 +0000 (08:26 +0300)]
Merge branch 'master' into foreach
* master:
reorder the branches
ppid must be IS_STRING
Use proper type
The argument must be not changed in session_start
Fixed annoying warnings
Cleanup session id files after test
Fixed Bug #68941 mod_files.sh is a bash-script
Remove support for hex number from is_numeric_string
add imap
Update News
Fixed bug #68901 (use after free)
Remove legacy code
Forgot to apply important peace of patch
Fixed crash
Fixed some annoying warnings
Fix typo in doc
Update UPGRADING and UPGRADING.INTERNALS
Make session_decode return FALSE when it fails. Fix a test. Use proper types.
WIP - test passes
Xinchen Hui [Thu, 29 Jan 2015 04:50:56 +0000 (12:50 +0800)]
reorder the branches
Xinchen Hui [Thu, 29 Jan 2015 04:35:44 +0000 (12:35 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Thu, 29 Jan 2015 04:35:18 +0000 (12:35 +0800)]
ppid must be IS_STRING
Yasuo Ohgaki [Thu, 29 Jan 2015 04:28:28 +0000 (13:28 +0900)]
Use proper type
Xinchen Hui [Thu, 29 Jan 2015 04:22:55 +0000 (12:22 +0800)]
The argument must be not changed in session_start
Xinchen Hui [Thu, 29 Jan 2015 03:59:37 +0000 (11:59 +0800)]
Fixed annoying warnings
Yasuo Ohgaki [Thu, 29 Jan 2015 03:03:58 +0000 (12:03 +0900)]
Merge branch 'pull-request/1016'
* pull-request/1016:
Implement RFC: Introduce session_start() options
Yasuo Ohgaki [Thu, 29 Jan 2015 01:31:39 +0000 (10:31 +0900)]
Cleanup session id files after test
Yasuo Ohgaki [Thu, 29 Jan 2015 00:55:36 +0000 (09:55 +0900)]
Merge branch 'master' into master-rfc-session-lock4
Conflicts:
UPGRADING
Yasuo Ohgaki [Thu, 29 Jan 2015 00:29:57 +0000 (09:29 +0900)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed Bug #68941 mod_files.sh is a bash-script
Yasuo Ohgaki [Thu, 29 Jan 2015 00:26:55 +0000 (09:26 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed Bug #68941 mod_files.sh is a bash-script
Yasuo Ohgaki [Thu, 29 Jan 2015 00:23:10 +0000 (09:23 +0900)]
Fixed Bug #68941 mod_files.sh is a bash-script
Nikita Popov [Tue, 17 Apr 2012 13:45:53 +0000 (15:45 +0200)]
Remove support for hex number from is_numeric_string
Stanislav Malyshev [Sun, 25 Jan 2015 09:21:53 +0000 (01:21 -0800)]
add imap
Xinchen Hui [Wed, 28 Jan 2015 16:02:03 +0000 (00:02 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
ext/phar/phar_object.c
Xinchen Hui [Wed, 28 Jan 2015 16:01:24 +0000 (00:01 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Wed, 28 Jan 2015 16:01:13 +0000 (00:01 +0800)]
Update News
Xinchen Hui [Wed, 28 Jan 2015 16:01:00 +0000 (00:01 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 28 Jan 2015 16:00:09 +0000 (00:00 +0800)]
Fixed bug #68901 (use after free)
Dmitry Stogov [Wed, 28 Jan 2015 14:34:20 +0000 (17:34 +0300)]
Merge branch 'master' into foreach
* master:
fix unportable dereferencing
fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed
Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
Anatol Belski [Wed, 28 Jan 2015 14:14:56 +0000 (15:14 +0100)]
fix unportable dereferencing
Dmitry Stogov [Wed, 28 Jan 2015 13:52:21 +0000 (16:52 +0300)]
Fixed foreach by reference iteration over constant array
Popa Adrian Marius [Wed, 28 Jan 2015 13:39:58 +0000 (15:39 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src:
Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
Popa Adrian Marius [Wed, 28 Jan 2015 13:39:42 +0000 (15:39 +0200)]
fbird_close if connection_id omitted, the last opened link is assumed , so it was already closed
Dmitry Stogov [Wed, 28 Jan 2015 11:59:54 +0000 (14:59 +0300)]
Fixed temporary variable re-allocation pass
Dmitry Stogov [Wed, 28 Jan 2015 09:44:57 +0000 (12:44 +0300)]
Fixed operand destruction in case of exceptions in iterator
Xinchen Hui [Wed, 28 Jan 2015 09:12:23 +0000 (17:12 +0800)]
Fixed #68868 (Segfault in clean_non_persistent_constants() in SugarCRM 6.5.20)
Dmitry Stogov [Wed, 28 Jan 2015 07:02:34 +0000 (10:02 +0300)]
Use GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE)
Yasuo Ohgaki [Wed, 28 Jan 2015 07:01:10 +0000 (16:01 +0900)]
Remove legacy code
Yasuo Ohgaki [Wed, 28 Jan 2015 05:22:22 +0000 (14:22 +0900)]
Forgot to apply important peace of patch
Dmitry Stogov [Wed, 28 Jan 2015 04:43:28 +0000 (07:43 +0300)]
Change "foreach" statement behavior (this is just a PoC yet)
- "foreach by value" don't relay on internal array/object pointer and doesnt perform array duplication. It just locks it incrementing reference counter. If the original array is modified by some code, the copy on write is performed and "foreach" still work with the old copy.
- it makes no difference if array given to "foreach by value" is reference itself
- "foreach by reference" still use internal array/object pointer and should work similar to PHP-5. (This id not completely implemented)
Dmitry Stogov [Wed, 28 Jan 2015 03:56:19 +0000 (06:56 +0300)]
Merge branch 'typed_returns' of github.com:morrisonlevi/php-src into test
* 'typed_returns' of github.com:morrisonlevi/php-src:
Implement return types
Xinchen Hui [Wed, 28 Jan 2015 02:55:25 +0000 (10:55 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Yasuo Ohgaki [Tue, 27 Jan 2015 23:03:37 +0000 (08:03 +0900)]
Fixed crash
Stanislav Malyshev [Tue, 27 Jan 2015 21:48:02 +0000 (13:48 -0800)]
update the .re file for PDO
Levi Morrison [Thu, 8 Jan 2015 20:40:36 +0000 (23:40 +0300)]
Implement return types
RFC is documented here: https://wiki.php.net/rfc/return_types
Daniel Lowrey [Tue, 27 Jan 2015 18:23:58 +0000 (13:23 -0500)]
Merge branch 'windows-ssl-timeout-fix'
Daniel Lowrey [Tue, 27 Jan 2015 18:22:47 +0000 (13:22 -0500)]
Merge https://github.com/bbroerman30/php-src into windows-ssl-timeout-fix
Conflicts:
ext/openssl/xp_ssl.c
Stanislav Malyshev [Tue, 27 Jan 2015 17:22:07 +0000 (09:22 -0800)]
bump the API no
Xinchen Hui [Tue, 27 Jan 2015 15:28:31 +0000 (23:28 +0800)]
Fixed some annoying warnings
Xinchen Hui [Tue, 27 Jan 2015 14:25:55 +0000 (22:25 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Tue, 27 Jan 2015 14:25:45 +0000 (22:25 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 27 Jan 2015 14:25:38 +0000 (22:25 +0800)]
fcgi_write in fpm returns ssizt_t, but it returns int in cgi
Xinchen Hui [Tue, 27 Jan 2015 14:20:17 +0000 (22:20 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Tue, 27 Jan 2015 14:20:03 +0000 (22:20 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 27 Jan 2015 14:19:11 +0000 (22:19 +0800)]
Revert previous unintentional change to this
Xinchen Hui [Tue, 27 Jan 2015 14:15:12 +0000 (22:15 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
sapi/cgi/cgi_main.c
Xinchen Hui [Tue, 27 Jan 2015 14:13:30 +0000 (22:13 +0800)]
Update NEWs
Xinchen Hui [Tue, 27 Jan 2015 14:13:04 +0000 (22:13 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 27 Jan 2015 14:11:23 +0000 (22:11 +0800)]
Also Fixed #68571 in CGI SAPI, and some cleanup
Xinchen Hui [Tue, 27 Jan 2015 14:04:23 +0000 (22:04 +0800)]
Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
Xinchen Hui [Tue, 27 Jan 2015 12:35:25 +0000 (20:35 +0800)]
minor CS fix
Márcio Almada [Sat, 24 Jan 2015 04:50:59 +0000 (01:50 -0300)]
add another test to #1022
Márcio Almada [Fri, 23 Jan 2015 20:23:35 +0000 (17:23 -0300)]
fix failure with shared zvals in php_str_replace_in_subject
Márcio Almada [Fri, 23 Jan 2015 20:23:24 +0000 (17:23 -0300)]
add failing test for string_replace and array replaces with references
```
make test TESTS=ext/standard/tests/strings/str_replace_*.phpt
```
Xinchen Hui [Tue, 27 Jan 2015 07:58:05 +0000 (15:58 +0800)]
Fixed #68915 (wrong assertion here)
Brad Broerman [Tue, 27 Jan 2015 02:35:35 +0000 (21:35 -0500)]
Quick fix
Brad Broerman [Tue, 27 Jan 2015 01:40:52 +0000 (20:40 -0500)]
Fixed windows infinite loop problem.
Stanislav Malyshev [Mon, 26 Jan 2015 21:53:16 +0000 (13:53 -0800)]
size_t cleanup for PDO
Bob Weinand [Mon, 26 Jan 2015 21:53:36 +0000 (22:53 +0100)]
Merge branch 'PHP-5.6'
Conflicts:
NEWS
main/streams/filter.c
Bob Weinand [Mon, 26 Jan 2015 21:51:37 +0000 (22:51 +0100)]
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
Conflicts:
NEWS
Bob Weinand [Mon, 26 Jan 2015 21:50:16 +0000 (22:50 +0100)]
Add NEWS entry
Bob Weinand [Mon, 26 Jan 2015 21:47:35 +0000 (22:47 +0100)]
Fix call after close if multiple filters are attached
Keyur Govande [Mon, 26 Jan 2015 21:44:14 +0000 (21:44 +0000)]
One more bad merge fix
Keyur Govande [Mon, 26 Jan 2015 21:38:43 +0000 (21:38 +0000)]
Fix bad merge
Keyur Govande [Mon, 26 Jan 2015 21:36:36 +0000 (21:36 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add NEWS
Patch commit
d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
Patch commit
d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
Conflicts:
ext/mysqli/mysqli_api.c
ext/mysqlnd/mysql_float_to_double.h
Keyur Govande [Mon, 26 Jan 2015 21:32:32 +0000 (21:32 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add NEWS
Patch commit
d9f85373e32 by moving the float_to_double function to a header file.
Fix for bugs #68114 (Build fails on OS X due to undefined symbols) and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient has rounding errors).
Conflicts:
ext/mysqlnd/config9.m4
Keyur Govande [Mon, 26 Jan 2015 21:29:57 +0000 (21:29 +0000)]
Add NEWS
Keyur Govande [Wed, 7 Jan 2015 21:13:57 +0000 (21:13 +0000)]
Patch commit
d9f85373e32 by moving the float_to_double function to
a header file.
Keyur Govande [Tue, 6 Jan 2015 06:33:38 +0000 (06:33 +0000)]
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
Keyur Govande [Wed, 7 Jan 2015 21:13:57 +0000 (21:13 +0000)]
Patch commit
d9f85373e32 by moving the float_to_double function to
a header file.
Keyur Govande [Tue, 6 Jan 2015 06:33:38 +0000 (06:33 +0000)]
Fix for bugs #68114 (Build fails on OS X due to undefined symbols)
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).
The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
Nikita Popov [Thu, 11 Sep 2014 11:03:58 +0000 (13:03 +0200)]
Remove dl() on fpm-fcgi
Nikita Popov [Wed, 10 Sep 2014 15:19:02 +0000 (17:19 +0200)]
Remove preg_replace /e modifier
Nikita Popov [Wed, 10 Sep 2014 13:55:26 +0000 (15:55 +0200)]
Remove assignment of new by reference
Dmitry Stogov [Mon, 26 Jan 2015 12:33:10 +0000 (15:33 +0300)]
Fixed wrong size
Ferenc Kovacs [Mon, 26 Jan 2015 10:14:15 +0000 (11:14 +0100)]
add a custom built pear installer until we have an official release with php7 compat. see https://github.com/pear/pear-core/pull/33 for the details
Ferenc Kovacs [Mon, 26 Jan 2015 10:09:53 +0000 (11:09 +0100)]
Revert "Disable PEAR by default"
This reverts commit
df984ad4f5e4e53e3f8bdafc7d620fd8112a121c .
Dmitry Stogov [Mon, 26 Jan 2015 09:24:33 +0000 (12:24 +0300)]
Fixed use after free
Dmitry Stogov [Mon, 26 Jan 2015 08:25:05 +0000 (11:25 +0300)]
Fixed bug #68896 (Changing ArrayObject value cause Segment Fault)
Xinchen Hui [Mon, 26 Jan 2015 06:41:45 +0000 (14:41 +0800)]
Fixed ext/standard/tests/general_functions/bug41970.phpt fails
Yasuo Ohgaki [Mon, 26 Jan 2015 01:24:12 +0000 (10:24 +0900)]
Fix typo in doc
Yasuo Ohgaki [Sun, 25 Jan 2015 21:14:40 +0000 (06:14 +0900)]
Update UPGRADING and UPGRADING.INTERNALS
Nikita Popov [Sun, 25 Jan 2015 13:48:54 +0000 (14:48 +0100)]
Disable PEAR by default
Given how it doesn't work and it doesn't seem like it will start
working in the immediate future.
Stanislav Malyshev [Sun, 25 Jan 2015 08:04:18 +0000 (00:04 -0800)]
map fixes
Stanislav Malyshev [Sat, 24 Jan 2015 22:14:53 +0000 (14:14 -0800)]
Fix the fix for #68884
Yasuo Ohgaki [Sun, 25 Jan 2015 06:47:27 +0000 (15:47 +0900)]
Merge branch 'master' into master-rfc-session-lock4
Yasuo Ohgaki [Sun, 25 Jan 2015 06:26:00 +0000 (15:26 +0900)]
Make session_decode return FALSE when it fails.
Fix a test.
Use proper types.
Rasmus Lerdorf [Sun, 25 Jan 2015 00:05:42 +0000 (16:05 -0800)]
These tests all have intentional circular references
and they will leak and cause failures unless gc is enabled
Nikita Popov [Sat, 24 Jan 2015 22:11:05 +0000 (23:11 +0100)]
Fix resource leak when casting to string
Nikita Popov [Sat, 24 Jan 2015 20:50:04 +0000 (21:50 +0100)]
Fix declare encoding tests
Also add a test for bwoebi's last change.
Bob Weinand [Sat, 24 Jan 2015 19:00:46 +0000 (20:00 +0100)]
Fix segfault when no class ctx is defined
Nikita Popov [Sat, 24 Jan 2015 18:53:07 +0000 (19:53 +0100)]
Fix build
Bob Weinand [Sat, 24 Jan 2015 18:19:02 +0000 (19:19 +0100)]
Inline self-constants if possible at compile time
Xinchen Hui [Sat, 24 Jan 2015 14:51:37 +0000 (22:51 +0800)]
Fixed bug #68897 (Using variable for sort flag in array_multisort cause wrong results)
Márcio Almada [Sat, 24 Jan 2015 03:26:01 +0000 (00:26 -0300)]
remove unused var, make string.c compilation zero warnings
Anatol Belski [Fri, 23 Jan 2015 19:57:47 +0000 (20:57 +0100)]
Merge branch 'pull-request/1023'