415482ac0a
Delete immutable arrays copied into SHM (related to bug #67725 )
2014-08-04 20:20:12 +04:00
7301994c28
Merge branch 'master' into phpng
...
* master: (46 commits)
PHP_INT_MIN and _MAX tests
NEWS and UPGRADING
Added PHP_INT_MIN
Fix wrong lenght size
Bug #51096 - Remove unnecessary ? for first/last day of
Moved streams related functions to xp_ssl.c
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
We need to turn off any strict mode here for this warning to show up
Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
Revert "Fix bug #67064 in a BC safe way"
Updated NEWS for #67693
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
add missing entry to NEWS
...
Conflicts:
Zend/tests/errmsg_040.phpt
Zend/tests/ns_059.phpt
Zend/zend_language_parser.y
Zend/zend_vm_def.h
ext/openssl/openssl.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_directory.c
ext/spl/spl_iterators.c
ext/sqlite3/sqlite3.c
ext/standard/array.c
2014-08-04 13:56:27 +04:00
fe894c2154
PHP_INT_MIN and _MAX tests
2014-08-01 17:01:17 +01:00
a2bbc6f985
Merge branch 'PHP_INT_MIN'
2014-08-01 16:29:34 +01:00
d6cf8be094
NEWS and UPGRADING
2014-08-01 16:28:20 +01:00
24d7fc2bbc
Added PHP_INT_MIN
2014-08-01 14:29:50 +01:00
1d609d2d26
Merge branch 'PHP-5.6'
2014-07-31 21:28:19 +03:00
f5deb18b20
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-31 21:28:09 +03:00
95febf26c6
Fix wrong lenght size
2014-07-31 21:27:51 +03:00
d5542c4a17
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:35:13 +01:00
6a4f0b14eb
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:34:50 +01:00
c2f2d5c8fc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #51096 - Remove unnecessary ? for first/last day of
Conflicts:
ext/date/lib/parse_date.c
2014-07-31 14:33:55 +01:00
bff84d7c18
Merge branch 'pull-request/754' into PHP-5.4
2014-07-31 14:30:39 +01:00
358aedc454
Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:21:38 +01:00
863a603fad
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
2014-07-31 18:16:08 +08:00
238a3167e6
Fixed valgrind issues
2014-07-31 18:15:47 +08:00
534dfa84a1
Merge branch 'phpng' of git.php.net:php-src into phpng
...
* 'phpng' of git.php.net:php-src:
Fixed getDefaultProperties (it should not return reference)
Fixed invalid free
Fixed segfault
2014-07-31 10:55:39 +04:00
449f3e6452
Fixed resource leak
2014-07-31 10:53:31 +04:00
7275306887
Fixed check for eval()
2014-07-31 10:52:48 +04:00
c201ba8fff
execute_data->return_value should be initialized when call internal constructors
2014-07-31 10:51:49 +04:00
f693cf8e66
EA must be initialized
2014-07-31 10:50:27 +04:00
cf5b3ed31c
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
2014-07-31 12:57:37 +08:00
be010e26c4
Fixed getDefaultProperties (it should not return reference)
2014-07-31 12:55:53 +08:00
a41a16c5cd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Moved streams related functions to xp_ssl.c
2014-07-31 12:18:19 +08:00
8f345a7148
Moved streams related functions to xp_ssl.c
2014-07-31 12:17:17 +08:00
33ce329f57
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
2014-07-30 18:50:07 +00:00
4383ac04a0
Remove duplicate NEWS
2014-07-30 18:48:43 +00:00
33c4b9d5a6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Update NEWS
Update NEWS
2014-07-30 18:41:13 +00:00
b96224625c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
2014-07-30 18:39:59 +00:00
7b60430a8f
Update NEWS
2014-07-30 18:39:23 +00:00
752c40d2ec
Update NEWS
2014-07-30 18:38:48 +00:00
0a29e4731e
Update NEWS
2014-07-30 18:33:19 +00:00
03f56152e5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:14:40 +02:00
b3b25e1b70
BFN
2014-07-30 20:14:03 +02:00
ceadf783fe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:13:39 +02:00
48cadf242d
BFN
2014-07-30 20:13:17 +02:00
6ed9991a6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:12:50 +02:00
12b2127b72
Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:12:13 +02:00
e7d921fd0b
Merge commit '8b9719d'
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:46 -04:00
7fe21ce0f3
Merge commit '8b9719d' into PHP-5.6
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:36 -04:00
579c9066a0
Merge commit '8b9719d' into PHP-5.5
...
* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:24 -04:00
8b9719d8b9
We need to turn off any strict mode here for this warning to show up
2014-07-30 12:22:48 -04:00
3c0adf2dcd
Merge branch 'PHP-5.6'
2014-07-30 18:07:01 +02:00
d5ddd2dbb2
Disable restrictions regarding arrays in constants at run-time.
...
For the discussion around it, see the thread on the mailing list:
http://www.mail-archive.com/internals@lists.php.net/msg68245.html
2014-07-30 17:57:07 +02:00
354ee12b73
Revert "Fix bug #67064 in a BC safe way"
...
This reverts commit 1a4a9eede5
2014-07-30 17:18:05 +02:00
0dc88c45b8
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
2014-07-30 18:28:23 +08:00
f925892920
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
2014-07-30 18:27:29 +08:00
52f4587e8a
Updated NEWS for #67693
2014-07-30 18:17:36 +08:00
e9967292c3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
2014-07-30 18:17:13 +08:00
b3466f862f
Updated NEWS for #67693
2014-07-30 18:16:56 +08:00
Dmitry Stogov