mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-07 03:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
67,977 Commits 505 Branches 1,389 Tags 835 MiB
a8cc0b05b4
Commit Graph

67977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
a8cc0b05b4 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #49853 (Soap Client stream context header option ignored)

Conflicts:
	NEWS
	ext/soap/php_sdl.c
 2012-03-21 16:42:08 +04:00
Dmitry Stogov
657547f8c4 Fixed bug #49853 (Soap Client stream context header option ignored) 2012-03-21 16:32:49 +04:00
David Soria Parra
1e18f11c9a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Always keep the NEWS file from the branch when merging
 2012-03-21 12:41:40 +01:00
David Soria Parra
944e622821 Always keep the NEWS file from the branch when merging 
We usually don't want to touch the NEWS files when we merge and have the
news items not merged by git. Therefore we tell git to use the 'ours' strategy
for the NEWS file.
 2012-03-21 12:38:43 +01:00
David Soria Parra
f3f0ced4bb Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - update NEWS
  - add test for bug #55000 and #54374
  - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664

Conflicts:
	NEWS
 2012-03-21 12:14:35 +01:00
Pierre Joye
fda25d97ff - update NEWS 2012-03-21 07:06:07 +01:00
Pierre Joye
baeaafd395 - add test for bug #55000 and #54374 2012-03-21 07:00:22 +01:00
Pierre Joye
95dcd799fb - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664 2012-03-21 06:58:55 +01:00
Ilia Alshanetsky
9dcfb8c73f Fixed bug #61461 (missing checks around malloc() calls). 2012-03-20 21:07:08 -04:00
Stanislav Malyshev
f3f76e5e8a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  adapt makedist to git
 2012-03-20 10:02:22 -07:00
Stanislav Malyshev
cb4e82a1cc adapt makedist to git 2012-03-20 10:02:00 -07:00
David Soria Parra
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
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
David Soria Parra
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
David Soria Parra
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
Matt Nowack
76ef76d2f8 Adding Braces in json.c to conform with coding standards 2012-03-20 17:29:04 +01:00
Xinchen Hui
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
Xinchen Hui
7aa2b75db2 Ignore the temporay files in sapi/*/tests/ 2012-03-20 17:20:15 +08:00
Xinchen Hui
868dbe127a Ignore the temporay files in sapi/*/tests/ 2012-03-20 15:59:17 +08:00
Xinchen Hui
e1931dd1ad Minor change, test using php mail address as account 2012-03-20 15:41:43 +08:00
Xinchen Hui
30bd2494a2 Use newdoc instead of escape char 2012-03-20 15:26:58 +08:00
Stanislav Malyshev
44d948996f adapt makedist to git 2012-03-19 22:28:16 -07:00
Christopher Jones
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
Christopher Jones
4a6d9b348f Minor text changes (to try new git repo) 2012-03-19 15:16:33 -07:00
David Soria Parra
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
Joshua Thijssen
91f2d3809e Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK 2012-03-19 21:48:55 +01:00
Ilia Alshanetsky
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
Michael Wallner
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
Michael Wallner
867d980574 add note about corrected tiger hash output 2012-03-19 20:15:54 +01:00
Gustavo André dos Santos Lopes
f5f5ca5d77 Merge branch 'PHP-5.4' of git.php.net:/php-src into 5.4 2012-03-19 17:50:13 +00:00
Sebastian Bergmann
5bfd8920a2 Merge branch 'PHP-5.3' into PHP-5.4 2012-03-19 18:25:49 +01:00
Sebastian Bergmann
bcd19cf649 Add missing files. 2012-03-19 18:25:37 +01:00
Ilia Alshanetsky
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
Ilia Alshanetsky
edb57810a7 Fixed bug #61430 (Transposed memset() params in sapi/fpm/fpm/fpm_shm.c). 2012-03-19 13:10:23 -04:00
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
David Soria Parra
53e3467ff2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Add .gitignore
 2012-03-19 15:59:45 +01:00
David Soria Parra
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
David Soria Parra
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
David Soria Parra
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Gustavo André dos Santos Lopes
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
Ilia Alshanetsky
9bfe8010a0 Fixed typo 2012-03-17 17:51:51 +00:00
Michael Wallner
a07759a013 add --PUT-- section support based on POST_RAW 2012-03-17 09:35:25 +00:00
Michael Wallner
0b94acdcb8 add --PUT-- section support based on POST_RAW 2012-03-17 09:35:25 +00:00
Pierre Joye
8fec627bd8 - Fix bug #61424, ext/sqlite is not bundled anymore, remove it from php.ini 2012-03-17 08:52:27 +00:00