]> granicus.if.org Git - php/log
php
10 years agoUse GET_OP1_ZVAL_PTR_DEREF() (IS_TMP_VAR and IS_CONST can't be IS_REFERENCE)
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)

10 years agoChange "foreach" statement behavior (this is just a PoC yet)
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)

10 years agoMerge branch 'typed_returns' of github.com:morrisonlevi/php-src into test
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

10 years agoupdate the .re file for PDO
Stanislav Malyshev [Tue, 27 Jan 2015 21:48:02 +0000 (13:48 -0800)]
update the .re file for PDO

10 years agoImplement return types
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

10 years agoMerge branch 'windows-ssl-timeout-fix'
Daniel Lowrey [Tue, 27 Jan 2015 18:23:58 +0000 (13:23 -0500)]
Merge branch 'windows-ssl-timeout-fix'

10 years agoMerge https://github.com/bbroerman30/php-src into 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

10 years agobump the API no
Stanislav Malyshev [Tue, 27 Jan 2015 17:22:07 +0000 (09:22 -0800)]
bump the API no

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 27 Jan 2015 14:25:55 +0000 (22:25 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into 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

10 years ago fcgi_write in fpm returns ssizt_t, but it returns int in cgi
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

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 27 Jan 2015 14:20:17 +0000 (22:20 +0800)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into 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

10 years agoRevert previous unintentional change to this
Xinchen Hui [Tue, 27 Jan 2015 14:19:11 +0000 (22:19 +0800)]
Revert previous unintentional change to this

10 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Tue, 27 Jan 2015 14:15:12 +0000 (22:15 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
sapi/cgi/cgi_main.c

10 years agoUpdate NEWs
Xinchen Hui [Tue, 27 Jan 2015 14:13:30 +0000 (22:13 +0800)]
Update NEWs

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 27 Jan 2015 14:13:04 +0000 (22:13 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoAlso Fixed #68571 in CGI SAPI, and some cleanup
Xinchen Hui [Tue, 27 Jan 2015 14:11:23 +0000 (22:11 +0800)]
Also Fixed #68571 in CGI SAPI, and some cleanup

10 years agoMerge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5
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

10 years agominor CS fix
Xinchen Hui [Tue, 27 Jan 2015 12:35:25 +0000 (20:35 +0800)]
minor CS fix

10 years agoadd another test to #1022
Márcio Almada [Sat, 24 Jan 2015 04:50:59 +0000 (01:50 -0300)]
add another test to #1022

10 years agofix failure with shared zvals in php_str_replace_in_subject
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

10 years agoadd failing test for string_replace and array replaces with references
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
```

10 years agoFixed #68915 (wrong assertion here)
Xinchen Hui [Tue, 27 Jan 2015 07:58:05 +0000 (15:58 +0800)]
Fixed #68915 (wrong assertion here)

10 years agoQuick fix
Brad Broerman [Tue, 27 Jan 2015 02:35:35 +0000 (21:35 -0500)]
Quick fix

10 years agoFixed windows infinite loop problem.
Brad Broerman [Tue, 27 Jan 2015 01:40:52 +0000 (20:40 -0500)]
Fixed windows infinite loop problem.

10 years agosize_t cleanup for PDO
Stanislav Malyshev [Mon, 26 Jan 2015 21:53:16 +0000 (13:53 -0800)]
size_t cleanup for PDO

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Mon, 26 Jan 2015 21:53:36 +0000 (22:53 +0100)]
Merge branch 'PHP-5.6'

Conflicts:
NEWS
main/streams/filter.c

10 years agoMerge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
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

10 years agoAdd NEWS entry
Bob Weinand [Mon, 26 Jan 2015 21:50:16 +0000 (22:50 +0100)]
Add NEWS entry

10 years agoFix call after close if multiple filters are attached
Bob Weinand [Mon, 26 Jan 2015 21:47:35 +0000 (22:47 +0100)]
Fix call after close if multiple filters are attached

10 years agoOne more bad merge fix
Keyur Govande [Mon, 26 Jan 2015 21:44:14 +0000 (21:44 +0000)]
One more bad merge fix

10 years agoFix bad merge
Keyur Govande [Mon, 26 Jan 2015 21:38:43 +0000 (21:38 +0000)]
Fix bad merge

10 years agoMerge branch 'PHP-5.6'
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

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

10 years agoAdd NEWS
Keyur Govande [Mon, 26 Jan 2015 21:29:57 +0000 (21:29 +0000)]
Add NEWS

10 years agoPatch commit d9f85373e32 by moving the float_to_double function to
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.

10 years agoFix for bugs #68114 (Build fails on OS X due to undefined symbols)
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()

10 years agoPatch commit d9f85373e32 by moving the float_to_double function to
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.

10 years agoFix for bugs #68114 (Build fails on OS X due to undefined symbols)
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()

10 years agoRemove dl() on fpm-fcgi
Nikita Popov [Thu, 11 Sep 2014 11:03:58 +0000 (13:03 +0200)]
Remove dl() on fpm-fcgi

10 years agoRemove preg_replace /e modifier
Nikita Popov [Wed, 10 Sep 2014 15:19:02 +0000 (17:19 +0200)]
Remove preg_replace /e modifier

10 years agoRemove assignment of new by reference
Nikita Popov [Wed, 10 Sep 2014 13:55:26 +0000 (15:55 +0200)]
Remove assignment of new by reference

10 years agoFixed wrong size
Dmitry Stogov [Mon, 26 Jan 2015 12:33:10 +0000 (15:33 +0300)]
Fixed wrong size

10 years agoadd a custom built pear installer until we have an official release with php7 compat...
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

10 years agoRevert "Disable PEAR by default"
Ferenc Kovacs [Mon, 26 Jan 2015 10:09:53 +0000 (11:09 +0100)]
Revert "Disable PEAR by default"

This reverts commit df984ad4f5e4e53e3f8bdafc7d620fd8112a121c.

10 years agoFixed use after free
Dmitry Stogov [Mon, 26 Jan 2015 09:24:33 +0000 (12:24 +0300)]
Fixed use after free

10 years agoFixed bug #68896 (Changing ArrayObject value cause Segment Fault)
Dmitry Stogov [Mon, 26 Jan 2015 08:25:05 +0000 (11:25 +0300)]
Fixed bug #68896 (Changing ArrayObject value cause Segment Fault)

10 years agoFixed ext/standard/tests/general_functions/bug41970.phpt fails
Xinchen Hui [Mon, 26 Jan 2015 06:41:45 +0000 (14:41 +0800)]
Fixed ext/standard/tests/general_functions/bug41970.phpt fails

10 years agoDisable PEAR by default
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.

10 years agomap fixes
Stanislav Malyshev [Sun, 25 Jan 2015 08:04:18 +0000 (00:04 -0800)]
map fixes

10 years agoFix the fix for #68884
Stanislav Malyshev [Sat, 24 Jan 2015 22:14:53 +0000 (14:14 -0800)]
Fix the fix for #68884

10 years agoThese tests all have intentional circular references
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

10 years agoFix resource leak when casting to string
Nikita Popov [Sat, 24 Jan 2015 22:11:05 +0000 (23:11 +0100)]
Fix resource leak when casting to string

10 years agoFix declare encoding tests
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.

10 years agoFix segfault when no class ctx is defined
Bob Weinand [Sat, 24 Jan 2015 19:00:46 +0000 (20:00 +0100)]
Fix segfault when no class ctx is defined

10 years agoFix build
Nikita Popov [Sat, 24 Jan 2015 18:53:07 +0000 (19:53 +0100)]
Fix build

10 years agoInline self-constants if possible at compile time
Bob Weinand [Sat, 24 Jan 2015 18:19:02 +0000 (19:19 +0100)]
Inline self-constants if possible at compile time

10 years agoFixed bug #68897 (Using variable for sort flag in array_multisort cause wrong results)
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)

10 years agoremove unused var, make string.c compilation zero warnings
Márcio Almada [Sat, 24 Jan 2015 03:26:01 +0000 (00:26 -0300)]
remove unused var, make string.c compilation zero warnings

10 years agoMerge branch 'pull-request/1023'
Anatol Belski [Fri, 23 Jan 2015 19:57:47 +0000 (20:57 +0100)]
Merge branch 'pull-request/1023'

10 years agoMake gc_collect_cycles hookable.
Adam Harvey [Tue, 2 Dec 2014 20:18:18 +0000 (12:18 -0800)]
Make gc_collect_cycles hookable.

10 years agoFixed memory leak
Dmitry Stogov [Fri, 23 Jan 2015 18:47:26 +0000 (21:47 +0300)]
Fixed memory leak

10 years agoFixed memory leak
Dmitry Stogov [Fri, 23 Jan 2015 17:35:32 +0000 (20:35 +0300)]
Fixed memory leak

10 years agocleanup TSRMLS_*
Anatol Belski [Fri, 23 Jan 2015 15:03:20 +0000 (16:03 +0100)]
cleanup TSRMLS_*

10 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Fri, 23 Jan 2015 14:11:19 +0000 (17:11 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  C89 compat

10 years agoFixed possible double free of class static members
Dmitry Stogov [Fri, 23 Jan 2015 14:10:05 +0000 (17:10 +0300)]
Fixed possible double free of class static members

10 years agoC89 compat
Anatol Belski [Fri, 23 Jan 2015 14:04:29 +0000 (15:04 +0100)]
C89 compat

10 years agoIt doesn't make sense to colect garbage after fatal errors
Dmitry Stogov [Fri, 23 Jan 2015 13:40:16 +0000 (16:40 +0300)]
It doesn't make sense to colect garbage after fatal errors

10 years agoRevert "Fixed ASSERTION"
Dmitry Stogov [Fri, 23 Jan 2015 13:37:39 +0000 (16:37 +0300)]
Revert "Fixed ASSERTION"

This reverts commit 76f438e06fc61d32272a1f9877266c8d97d871ba.

10 years agoMerge branch 'fix-strripos-memleak' of https://github.com/reeze/php-src
Xinchen Hui [Fri, 23 Jan 2015 09:35:37 +0000 (17:35 +0800)]
Merge branch 'fix-strripos-memleak' of https://github.com/reeze/php-src

10 years agoFix one more leak when wrong $needle type provide of strripos
Reeze Xia [Fri, 23 Jan 2015 09:14:39 +0000 (17:14 +0800)]
Fix one more leak when wrong $needle type provide of strripos

10 years agoFixed memory leak of strripos() when empty needle or haystack
Reeze Xia [Fri, 23 Jan 2015 08:53:58 +0000 (16:53 +0800)]
Fixed memory leak of strripos() when empty needle or haystack

10 years agoMerge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Fri, 23 Jan 2015 06:19:40 +0000 (14:19 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src

10 years agoFixed ASSERTION
Xinchen Hui [Fri, 23 Jan 2015 06:18:56 +0000 (14:18 +0800)]
Fixed ASSERTION

10 years agoNEWS
Daniel Lowrey [Fri, 23 Jan 2015 06:05:28 +0000 (01:05 -0500)]
NEWS

10 years agoMerge branch 'master' of https://github.com/bbroerman30/php-src
Daniel Lowrey [Fri, 23 Jan 2015 06:03:39 +0000 (01:03 -0500)]
Merge branch 'master' of https://github.com/bbroerman30/php-src

Conflicts:
ext/openssl/xp_ssl.c

10 years agoFixed refcount handling in get_class_vars()
Xinchen Hui [Fri, 23 Jan 2015 05:32:07 +0000 (13:32 +0800)]
Fixed refcount handling in get_class_vars()

10 years agoAdd missing ZEND_API tag to declaration of `int zendparse();`
Sara Golemon [Thu, 22 Jan 2015 22:04:49 +0000 (14:04 -0800)]
Add missing ZEND_API tag to declaration of `int zendparse();`

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Thu, 22 Jan 2015 20:29:03 +0000 (21:29 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix some factual errors in the process

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Thu, 22 Jan 2015 20:28:41 +0000 (21:28 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix some factual errors in the process

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ferenc Kovacs [Thu, 22 Jan 2015 20:28:21 +0000 (21:28 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix some factual errors in the process

10 years agofix some factual errors in the process
Ferenc Kovacs [Thu, 22 Jan 2015 20:27:38 +0000 (21:27 +0100)]
fix some factual errors in the process

10 years agoFixed compiler reenterability
Dmitry Stogov [Thu, 22 Jan 2015 17:39:34 +0000 (20:39 +0300)]
Fixed compiler reenterability

10 years agoFixed GC after destruction of object store.
Dmitry Stogov [Thu, 22 Jan 2015 17:38:42 +0000 (20:38 +0300)]
Fixed GC after destruction of object store.

10 years agoRemove Jouni (As requested) from the maintainers file of INTERBASE
Kalle Sommer Nielsen [Thu, 22 Jan 2015 14:15:02 +0000 (15:15 +0100)]
Remove Jouni (As requested) from the maintainers file of INTERBASE

10 years agoFixed bug #68884 Null pointer deference
Anatol Belski [Thu, 22 Jan 2015 14:00:50 +0000 (15:00 +0100)]
Fixed bug #68884 Null pointer deference

10 years agodefine() must not modify the source array
Dmitry Stogov [Thu, 22 Jan 2015 12:49:38 +0000 (15:49 +0300)]
define() must not modify the source array

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Thu, 22 Jan 2015 12:07:34 +0000 (13:07 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  move CVE to the right version

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Remi Collet [Thu, 22 Jan 2015 12:06:50 +0000 (13:06 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  move CVE to the right version

10 years agomove CVE to the right version
Remi Collet [Thu, 22 Jan 2015 12:06:15 +0000 (13:06 +0100)]
move CVE to the right version

10 years agoMerge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 22 Jan 2015 11:29:03 +0000 (12:29 +0100)]
Merge branch 'master' of git.php.net:php-src

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Thu, 22 Jan 2015 11:28:11 +0000 (12:28 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs

10 years agoFixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs
Anatol Belski [Thu, 22 Jan 2015 11:26:50 +0000 (12:26 +0100)]
Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs

The fix for bug #67647 applies here, too.

10 years agoFixed destruction of circular garbage
Dmitry Stogov [Thu, 22 Jan 2015 11:24:27 +0000 (14:24 +0300)]
Fixed destruction of circular garbage

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Thu, 22 Jan 2015 10:56:34 +0000 (11:56 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly

Conflicts:
ext/fileinfo/data_file.c

10 years agoFixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly
Anatol Belski [Thu, 22 Jan 2015 10:48:11 +0000 (11:48 +0100)]
Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly

10 years agoFixed double free and cleanup
Dmitry Stogov [Thu, 22 Jan 2015 09:59:53 +0000 (12:59 +0300)]
Fixed double free and cleanup

10 years agoMerge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 22 Jan 2015 09:19:08 +0000 (10:19 +0100)]
Merge branch 'master' of git.php.net:php-src

10 years agoMerge branch 'PHP-5.6'
Anatol Belski [Thu, 22 Jan 2015 09:17:45 +0000 (10:17 +0100)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  simplify error handling for dirs as magic