mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-02 17:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
68,011 Commits 505 Branches 1,389 Tags 800 MiB
bcc15b5633
Commit Graph

28255 Commits

Author SHA1 Message Date
Stanislav Malyshev
bcc15b5633 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  Add initialization tests for SQLT_INT binds
  Fix NEWS
 2012-03-22 22:30:51 -07:00
Stanislav Malyshev
a89c4a34ee Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482 
This reverts commit 714f1ff4b3.
 2012-03-22 22:29:50 -07:00
Christopher Jones
7164175e85 Add initialization tests for SQLT_INT binds 
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
 2012-03-22 13:24:46 -07:00
Christopher Jones
22f4043a38 Merge branch 'PHP-5.4' of /home/cjones/php-src into PHP-5.4 
* 'PHP-5.4' of /home/cjones/php-src: (21 commits)
  Fixed bug #61423 (gzip compression fails).
  BFN
  Fixed bug #61423 (gzip compression fails).
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Revert "Fixed reference counting"
  Fixed reference counting
  Fixed reference counting
  Fix test, and merge the modification from trunk
  Ignore the tempoary files
  Fix test, which was broken by the fix for #61173
  Use the NEWS merge driver if available
  Made some SplFileObject::fputcsv not pollute the working dir.
  Fixed bug #61453.
  Fixed bug #49853 (Soap Client stream context header option ignored)
  Always keep the NEWS file from the branch when merging
  Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831)
  - 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
  ...
 2012-03-22 11:34:25 -07:00
Ilia Alshanetsky
f9f631fb76 Fixed bug #61423 (gzip compression fails). 
Conflicts:

	NEWS
 2012-03-22 09:46:33 -04:00
Ilia Alshanetsky
b4aea52682 Fixed bug #61423 (gzip compression fails). 2012-03-22 09:13:45 -04:00
Dmitry Stogov
dd33437eee Revert "Fixed reference counting" 
This reverts commit 752fec88ef.
 2012-03-22 15:52:32 +04:00
Dmitry Stogov
672fe54a00 Revert "Fixed reference counting" 
This reverts commit 14af1fe692.
 2012-03-22 15:51:58 +04:00
Dmitry Stogov
752fec88ef Fixed reference counting 2012-03-22 15:03:38 +04:00
Dmitry Stogov
14af1fe692 Fixed reference counting 2012-03-22 15:03:16 +04:00
Xinchen Hui
df129ae7ea Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test, and merge the modification from trunk
 2012-03-22 17:31:15 +08:00
Xinchen Hui
523396cb28 Fix test, and merge the modification from trunk 2012-03-22 17:30:16 +08:00
Xinchen Hui
2dbced096a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix test, which was broken by the fix for #61173

Conflicts:
	ext/fileinfo/tests/finfo_open_error.phpt
 2012-03-22 17:17:42 +08:00
Xinchen Hui
e96a172114 Fix test, which was broken by the fix for #61173 2012-03-22 17:10:03 +08:00
Christopher Jones
ab825fdc24 Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 
* 'PHP-5.3' of ../php-5.3:
  Add initialization tests for SQLT_INT binds
 2012-03-21 16:14:51 -07:00
Christopher Jones
fe5785d92b Add initialization tests for SQLT_INT binds 
Added tests for SQLT_INT binds particularly to check for uninitialized
variables.
 2012-03-21 16:12:28 -07:00
Gustavo André dos Santos Lopes
54f0d50d3e Made some SplFileObject::fputcsv not pollute the working dir. 2012-03-21 13:13:17 +00:00
Dmitry Stogov
09e367dbaf Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2012-03-21 16:51:24 +04:00
Gustavo André dos Santos Lopes
0f001703a8 Fixed bug #61453. 
The "hash" function used strncpy on data that would have NUL bytes, ending the
copy prematurely and causing collisions between objects.
 2012-03-21 12:42:09 +00:00
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
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
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
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
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
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
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
Adam Harvey
9aec9ccd7c Fix bug #61409 (Bad formatting on phpinfo()). Patch by Jakub Vrana. 2012-03-16 02:07:46 +00:00
Ilia Alshanetsky
1ef5fa8710 Fixed bug #60947 (Segmentation fault while executing ibase_db_info) 2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
2dee9ec9f0 Fixed bug #60947 (Segmentation fault while executing ibase_db_info) 2012-03-15 19:59:26 +00:00
Ilia Alshanetsky
601d17d1ae Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ilia Alshanetsky
0af900f976 Fixed bug #61212 (PDO ODBC Segfaults on SQL_SUCESS_WITH_INFO). 2012-03-14 20:20:33 +00:00
Ulf Wendel
8665e02ccd Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Ulf Wendel
0fde9acd12 Test for MySQL version.Variable is deprecated in MySQL 5.6. 2012-03-14 14:55:09 +00:00
Gustavo André dos Santos Lopes
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
Christopher Jones
19c0803b77 Test portability and coverage changes 2012-03-12 18:08:34 +00:00
Christopher Jones
b1575ce9af Test portability and coverage changes 2012-03-12 18:08:34 +00:00
Ilia Alshanetsky
9c886ea553 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00
Ilia Alshanetsky
4cccba09e0 Fixed bug #60222 (time_nanosleep() does validate input params). 2012-03-12 16:53:07 +00:00