clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,594 Commits 493 Branches 1,365 Tags 848 MiB
836a2b1131
Commit Graph

69594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derick Rethans
1e081a825e Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3 2012-11-13 10:10:41 +00:00
Derick Rethans
d9aea7cd4d Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2012-11-13 10:10:28 +00:00
Adam Harvey
6b9df7a454 Merge branch 'preg_match_all_arginfo' into PHP-5.4 
* preg_match_all_arginfo:
  Update arginfo for preg_match_all() to reflect reality.
 2012-11-12 20:08:01 +08:00
Adam Harvey
bca8ff723d Update arginfo for preg_match_all() to reflect reality. 
Back when I implemented FR #53238 during the 5.4 development phase to make the
$matches parameter optional in preg_match_all(), it turns out I forgot to
update the arginfo to note that only 2 parameters are now required by
preg_match_all(). The function itself works fine, but reflection was reporting
the wrong number of required parameters.
 2012-11-12 20:04:26 +08:00
Antony Dovgal
5b82fb52fd fix invalid read when trimming empty string 2012-11-11 22:38:14 +04:00
Antony Dovgal
bb60122c2f fix invalid read when trimming empty string 2012-11-11 22:37:04 +04:00
Felipe Pena
065862a750 - BFN 2012-11-09 21:28:30 -02:00
Felipe Pena
964acdaa35 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
 2012-11-09 21:23:10 -02:00
Felipe Pena
44a6fe8411 - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created) 2012-11-09 21:22:27 -02:00
Johannes Schlüter
9d95f7d286 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	configure.in
	main/php_version.h
 2012-11-08 00:03:37 +01:00
Johannes Schlüter
417b1b238f This will be PHP 5.3.20 2012-11-08 00:01:43 +01:00
Stanislav Malyshev
3e7fcd9cab fix NEWS 2012-11-07 01:18:34 -08:00
Xinchen Hui
e222837f6e Merge branch 'PHP-5.3' into PHP-5.4 2012-11-07 17:08:34 +08:00
Xinchen Hui
7fcbe4d546 Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On) 2012-11-07 17:05:24 +08:00
Xinchen Hui
6ef09012aa Merge branch 'PHP-5.3' into PHP-5.4 2012-11-06 14:14:55 +08:00
Rasmus Lerdorf
0ee5d18f91 News entry for png memleak fix 2012-11-05 21:06:18 -08:00
Rasmus Lerdorf
7caca1614b News entry for png memleak fix 2012-11-05 21:04:33 -08:00
Rasmus Lerdorf
a983ded9bd Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 2012-11-05 20:58:04 -08:00
Rasmus Lerdorf
f8c280d85a These need to be volatile in order to prevent leaking after the 
longjmp in the error handler
 2012-11-05 20:57:15 -08:00
Rasmus Lerdorf
f452b9056e These need to be volatile in order to prevent leaking after the 
longjmp in the error handler
 2012-11-05 20:57:07 -08:00
Derick Rethans
db0f623490 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-04 16:24:02 +00:00
Derick Rethans
1784279be0 - Updated to version 2012.9 (2012i) 2012-11-04 16:23:58 +00:00
Xinchen Hui
153bfada90 Merge branch 'PHP-5.3' into PHP-5.4 2012-11-02 18:56:17 +08:00
Xinchen Hui
3fe3029ecb Fixed bug #62444 (Handle leak in is_readable on windows). 2012-11-02 18:53:06 +08:00
Anatoliy Belsky
24e4af0b8f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63241 PHP fails to open Windows deduplicated files.
 2012-10-31 22:55:32 +01:00
Anatoliy Belsky
a2e4404bc8 Fixed bug #63241 PHP fails to open Windows deduplicated files. 
Fix by (daniel dot stelter-gliese at innogames dot de).
No test is supplied because the issue addresses
the new feature of the Windows Server 2012 and
would need a very specific filesystem setup.
 2012-10-31 22:41:03 +01:00
Andrey Hristov
965bd32fec Merge branch 'PHP-5.3' into PHP-5.4 2012-10-31 18:29:31 +01:00
Andrey Hristov
a17559d422 read 1 instead of 2 bytes. The next 2 bytes are 2 and thus not a problem 2012-10-31 18:26:09 +01:00
Xinchen Hui
7886f46b56 Fixed bug #63399 (ReflectionClass::getTraitAliases() incorrectly resolves traitnames) 2012-10-31 11:13:32 +08:00
David Soria Parra
440bbcd9e3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  NEWS for bug #62593
  Bug #62593 Updated to account for INOUT parameters
  Bug #62593 Updated test to verify bindParam doesn't change original value
  Bug #62593 Updated to always treat zval by value
  Bug #62593 Added test for change
  Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode
 2012-10-30 15:43:32 +01:00
David Soria Parra
b3cd64afef NEWS for bug #62593 2012-10-30 15:26:39 +01:00
Will Fitch
d864063a18 Bug #62593 Updated to account for INOUT parameters 2012-10-30 14:32:32 +01:00
Will Fitch
d922e801ee Bug #62593 Updated test to verify bindParam doesn't change original value 2012-10-30 14:32:27 +01:00
Will Fitch
646c0e5738 Bug #62593 Updated to always treat zval by value 2012-10-30 14:32:22 +01:00
Will Fitch
f0835c002d Bug #62593 Added test for change 2012-10-30 14:32:16 +01:00
Will Fitch
7ea4f73ad4 Bug #62593 Updated pdo_pgsql driver to convert boolean values to pg native format in emulation mode 2012-10-30 14:32:09 +01:00
Xinchen Hui
3342e7276c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-30 11:10:26 +08:00
Xinchen Hui
2f1c4064f8 Fixed bug #63389 (Missing context check on libxml_set_streams_context() causes memleak) 
Simply change the expect parameter type, the valid of the resource will
be checked in using time.
 2012-10-30 11:08:14 +08:00
Derick Rethans
4c08ee069c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-27 15:19:55 +01:00
Derick Rethans
b5344e267a - Updated to version 2012.8 (2012h) 2012-10-27 15:19:54 +01:00
Dmitry Stogov
68b229ea73 Fixed bug #63180 (Corruption of hash tables) 2012-10-26 09:47:30 -07:00
Antony Dovgal
f2bffdc2e4 fix bug #63369 
(un)serialize() leaves dangling pointers, causes crashes
 2012-10-26 16:41:14 +04:00
Johannes Schlüter
4f4d77805c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/pdo_mysql/mysql_statement.c
 2012-10-26 14:22:31 +02:00
ULF WENDEL
056ecf3201 This won't make the test pass but now its at least one that shows no unnecessary error messages... 2012-10-26 12:32:10 +02:00
Anthony Ferrara
c4ce96d073 News entry for CURL notice addition 2012-10-25 16:04:56 -04:00
John Jawed (JJ)
f68f31f121 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 16:00:02 -04:00
ULF WENDEL
0737be7e7b Fix for bug #62820 2012-10-23 15:13:57 +02:00
ULF WENDEL
848780606d Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests 2012-10-23 14:58:16 +02:00
ULF WENDEL
38b632dd7c Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  merged changes for bug #63297 from 5.3
  fixed a typo in the error message
  Fixed bug #63297 Phar fails to write an openssl based signature
  enabled libxpm for gd on windows
  enabled libxpm for gd on windows
  Update test script
  Test for #63336, xfail now
  Fixed bug #63305 (zend_mm_heap corrupted with traits)
 2012-10-23 13:16:12 +02:00
Anatoliy Belsky
f962260081 merged changes for bug #63297 from 5.3 2012-10-25 09:40:21 +02:00