c918ca57a7
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Replace $Revision$ with $Id$ in keyword expansion enable files
Enable $Id$ expansion for files with the $Revision$ keyword
Conflicts:
ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
f7b10abae9
Replace $Revision$ with $Id$ in keyword expansion enable files
2012-03-20 17:53:47 +01:00
eb8812e58b
Enable $Id$ expansion for files with the $Revision$ keyword
...
Git supports a limited $Id$ keyword expansion. This $Id$ tag is similar to
$Revision$ in SVN. We enable the $Id$ expansion only for files that use
$Revision$.
2012-03-20 17:49:42 +01:00
71d894cd42
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Adding Braces in json.c to conform with coding standards
2012-03-20 17:29:20 +01:00
76ef76d2f8
Adding Braces in json.c to conform with coding standards
2012-03-20 17:29:04 +01:00
14ccdd1b55
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Ignore the temporay files in sapi/*/tests/
2012-03-20 17:21:35 +08:00
7aa2b75db2
Ignore the temporay files in sapi/*/tests/
2012-03-20 17:20:15 +08:00
868dbe127a
Ignore the temporay files in sapi/*/tests/
2012-03-20 15:59:17 +08:00
e1931dd1ad
Minor change, test using php mail address as account
2012-03-20 15:41:43 +08:00
30bd2494a2
Use newdoc instead of escape char
2012-03-20 15:26:58 +08:00
44d948996f
adapt makedist to git
2012-03-19 22:28:16 -07:00
08f586984f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Minor text changes (to try new git repo)
2012-03-19 15:18:06 -07:00
4a6d9b348f
Minor text changes (to try new git repo)
2012-03-19 15:16:33 -07:00
74eb9d4730
Merge branch 'pull-request/5' into PHP-5.4
...
* pull-request/5:
Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 22:11:02 +01:00
91f2d3809e
Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK
2012-03-19 21:48:55 +01:00
69a016b504
Merge branch 'PHP-5.4' of http://git.php.net/repository/php-src into 54
...
* 'PHP-5.4' of http://git.php.net/repository/php-src :
fix tests failing due to corrected hash tiger
2012-03-19 13:49:23 -04:00
260e77709d
fix tests failing due to corrected hash tiger
...
mhash_00{1,3}.phpt were failing because of the corrected hash tiger byte
output order
fixes bug #60922 :
tests fail for mhash() and mhash_keygen_s2k() functions and MHASH_TIGER
2012-03-19 21:49:47 +01:00
867d980574
add note about corrected tiger hash output
2012-03-19 20:15:54 +01:00
f5f5ca5d77
Merge branch 'PHP-5.4' of git.php.net:/php-src into 5.4
2012-03-19 17:50:13 +00:00
5bfd8920a2
Merge branch 'PHP-5.3' into PHP-5.4
2012-03-19 18:25:49 +01:00
bcd19cf649
Add missing files.
2012-03-19 18:25:37 +01:00
5709f7dd5b
Merge branch '53' into 54
...
* 53:
Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
2012-03-19 13:10:53 -04:00
edb57810a7
Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c).
2012-03-19 13:10:23 -04:00
cfdd6c5788
MFH: 7dcada1 for 5.4
...
- Fixed possible unsigned int wrap around in html.c. Note that 5.3 has the same
(potential) problem; even though the code is substantially different, the
variable name and the fashion it was incremented was kept.
2012-03-19 16:36:21 +00:00
9a460497da
MFH: 45a6f8d for 5.4.
...
- Further fix for bug #60455 (stream_get_line misbehaves if EOF is not detected
together with the last read).
- Fixed bug #60817 (stream_get_line() reads from stream even when there is
already sufficient data buffered). stream_get_line() now behaves more like
fgets(), as is documented.
2012-03-19 16:34:31 +00:00
53e3467ff2
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Add .gitignore
2012-03-19 15:59:45 +01:00
887ee455dc
Add .gitignore
...
The gitignore file was created using git svn show-ignore and the overlapping
patterns were removed.
2012-03-19 15:58:34 +01:00
dffd02903a
Merge branch 'PHP-5.3' into PHP-5.4
...
This merge is a "fake". It was done with the merge strategy
"ours" to ensure Git thinks both branches are in sync after
the migration from SVN.
2012-03-19 06:12:26 -07:00
3fd0b5f18a
Merge branch 'PHP-5.2' into PHP-5.3
...
This merge is a "fake". It was done with the merge strategy
"ours" to ensure Git thinks both branches are in sync after
the migration from SVN.
2012-03-19 06:11:40 -07:00
920072df65
- Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
...
when get_properties returns a hash table with (inaccessible) dynamic
numeric properties).
2012-03-18 18:23:27 +00:00
227112cb0f
- Fixed bug #61388 (ReflectionObject:getProperties() issues invalid reads
...
when get_properties returns a hash table with (inaccessible) dynamic
numeric properties).
2012-03-18 18:23:27 +00:00
d870a41118
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
...
FilesystemIterator's iterators are requested more than once without
having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
714f1ff4b3
- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or
...
FilesystemIterator's iterators are requested more than once without
having had its dtor callback called in between).
2012-03-18 15:07:20 +00:00
d974e44248
- Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
...
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
fixing bug #61115 . This better fix for #61115 fixes the leak (the inhibition
for deleting the context was too broad) and so prevents segfaults in new
circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
ef19fba2d5
- Fixed bug #61371 (resource leak). This bug had two parts, a long standing leak
...
already fixed in trunk/5.3 and now merged onto 5.4 and a leak introduced in
fixing bug #61115 . This better fix for #61115 fixes the leak (the inhibition
for deleting the context was too broad) and so prevents segfaults in new
circumstances (where the inhibition was not broad enough).
2012-03-17 19:37:30 +00:00
9bfe8010a0
Fixed typo
2012-03-17 17:51:51 +00:00
a07759a013
add --PUT-- section support based on POST_RAW
2012-03-17 09:35:25 +00:00
0b94acdcb8
add --PUT-- section support based on POST_RAW
2012-03-17 09:35:25 +00:00
8fec627bd8
- Fix bug #61424 , ext/sqlite is not bundled anymore, remove it from php.ini
2012-03-17 08:52:27 +00:00
9aec9ccd7c
Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana.
2012-03-16 02:07:46 +00:00
1ef5fa8710
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)
2012-03-15 19:59:26 +00:00
2dee9ec9f0
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)
2012-03-15 19:59:26 +00:00
601d17d1ae
Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).
2012-03-14 20:20:33 +00:00
0af900f976
Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO).
2012-03-14 20:20:33 +00:00
8665e02ccd
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
0fde9acd12
Test for MySQL version.Variable is deprecated in MySQL 5.6.
2012-03-14 14:55:09 +00:00
ed98579924
- Fixed bug #61374 : html_entity_decode tries to decode code points that don't
...
exist in ISO-8859-1.
2012-03-13 18:08:30 +00:00
403110fcc6
- add CVE
2012-03-13 12:55:33 +00:00
19c0803b77
Test portability and coverage changes
2012-03-12 18:08:34 +00:00
b1575ce9af
Test portability and coverage changes
2012-03-12 18:08:34 +00:00
David Soria Parra