Xinchen Hui
a071fc4604
Added CREDITS
2015-02-05 16:58:19 +08:00
Stanislav Malyshev
d937517cb3
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix test to not hit php.net
fix test to not hit php.net
2015-02-05 00:42:21 -08:00
Stanislav Malyshev
e9822e090d
fix test to not hit php.net
2015-02-05 00:42:11 -08:00
Stanislav Malyshev
2c386b55f2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test to not hit php.net
2015-02-05 00:41:55 -08:00
Stanislav Malyshev
d33f4c6eb8
fix test to not hit php.net
2015-02-05 00:41:51 -08:00
Stanislav Malyshev
10b15f0f8b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Conflicts: main/streams/memory.c
2015-02-05 00:41:35 -08:00
Xinchen Hui
e70c9f04ec
Remove extra space
2015-02-05 16:33:45 +08:00
Xinchen Hui
7ed3e04569
Merge branch 'PHP-5.6'
2015-02-05 16:33:29 +08:00
Xinchen Hui
ae90010891
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/streams/memory.c
2015-02-05 16:33:20 +08:00
Nayana Hettiarachchi
5446377c6b
Conflicts:
...
main/streams/memory.c
2015-02-05 16:32:30 +08:00
Xinchen Hui
aa74a52985
We'd better not include this test script
2015-02-05 16:27:01 +08:00
Xinchen Hui
22a468dc71
return size_t
2015-02-05 16:26:38 +08:00
Xinchen Hui
8f6f32ffe4
Merge branch 'validate_null_pointer_on_php_stream_temp_write' of https://github.com/devzer01/php-src
2015-02-05 16:22:10 +08:00
Stanislav Malyshev
ee864f3301
fix test to not hit php.net
2015-02-05 00:11:44 -08:00
Xinchen Hui
a3379d6691
Padding
2015-02-05 16:11:44 +08:00
Dmitry Stogov
f5a9cfc33a
Merge branch 'internal-function-return-types' of github.com:reeze/php-src into test
...
* 'internal-function-return-types' of github.com:reeze/php-src:
Add load time return type checking to match user land logic
Add test function arguments
Implemented internal function return types
2015-02-05 11:01:07 +03:00
Nayana Hettiarachchi
2794cc8dd2
fix test case
2015-02-05 14:59:17 +08:00
Nayana Hettiarachchi
76aa5d4c8b
expand test for #68986
2015-02-05 14:35:01 +08:00
Nayana Hettiarachchi
d00fe6fb0c
expand test for #68986
2015-02-05 14:34:36 +08:00
Nayana Hettiarachchi
b9a75171e9
adding test for #68986
2015-02-05 14:28:40 +08:00
Nayana Hettiarachchi
a3e07ff10c
#68986 bug fix
2015-02-05 12:26:29 +08:00
Reeze Xia
601fcc31af
Add load time return type checking to match user land logic
2015-02-05 11:22:11 +08:00
Reeze Xia
2c84006f5a
Add test function arguments
2015-02-05 01:21:42 +08:00
Anatol Belski
067902daee
fix data type mismatch
2015-02-04 18:13:29 +01:00
Anatol Belski
4a1e4e2870
fix unitialized val usage
2015-02-04 18:13:28 +01:00
Anatol Belski
b5d3c5ca8d
follow up fix for headers sent, checking a reference would be always true as well
2015-02-04 18:13:27 +01:00
Anatol Belski
1b87f31ba8
remove unused variable
2015-02-04 18:13:26 +01:00
Anatol Belski
430514e33d
fix wars about importing of locally defined symbols
2015-02-04 18:13:25 +01:00
Anatol Belski
614a628ace
fix data type
2015-02-04 18:13:24 +01:00
Reeze Xia
bff4c47fa7
Implemented internal function return types
2015-02-05 01:04:54 +08:00
Julien Pauli
c65f77d195
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
2015-02-04 17:46:14 +01:00
Julien Pauli
a79f332333
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS
2015-02-04 17:45:38 +01:00
Julien Pauli
959cecf046
Updated NEWS
2015-02-04 17:43:36 +01:00
Julien Pauli
58dee64f51
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
2015-02-04 17:40:07 +01:00
Julien Pauli
583af4979b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
2015-02-04 17:39:34 +01:00
Julien Pauli
f51b73c833
Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
...
This reverts commit 8e19705a93
2015-02-04 17:39:16 +01:00
Julien Pauli
f262e5f250
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.6.7 now
5.5.23 now
Conflicts:
configure.in
main/php_version.h
2015-02-04 17:34:28 +01:00
Julien Pauli
421d309908
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.5.23 now
Conflicts:
configure.in
main/php_version.h
2015-02-04 17:32:46 +01:00
Dmitry Stogov
a787719d4f
Removed TSRMLS_D
2015-02-04 18:47:30 +03:00
Julien Pauli
e6ea244004
5.6.7 now
2015-02-04 16:37:49 +01:00
Julien Pauli
b86529f751
5.5.23 now
2015-02-04 16:35:32 +01:00
Dmitry Stogov
8b46d45a9d
Simplify code and add comments
2015-02-04 17:56:14 +03:00
Dmitry Stogov
9e70d7672d
Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced.
2015-02-04 15:24:13 +03:00
Dmitry Stogov
87377c1707
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
2015-02-04 15:23:40 +03:00
Julien Pauli
dee113ba4a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
2015-02-04 13:10:59 +01:00
Julien Pauli
93315c4e1d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
2015-02-04 12:48:57 +01:00
Julien Pauli
c85f12e3ac
Revert "json_decode() should generate a syntax error when given ""."
...
This reverts commit a7b3abe4e6
2015-02-04 12:48:17 +01:00
Dmitry Stogov
7169698088
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Add note aout $HTTP_RAW_POST_DATA
2015-02-04 12:35:59 +03:00
Michael Wallner
ef058b7cb5
Add note aout $HTTP_RAW_POST_DATA
2015-02-04 10:22:52 +01:00
Dmitry Stogov
2428fd1c8b
Use object pointers instead of handles
2015-02-04 12:01:55 +03:00
