clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,666 Commits 494 Branches 1,367 Tags 810 MiB
a3f020a4be
Commit Graph

69666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov
111aa9fd2e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
	NEWS
 2012-11-20 12:54:40 +04:00
Dmitry Stogov
396c1e990a Fixed bug #63468 (wrong called method as callback with inheritance) 2012-11-20 12:51:55 +04:00
Christopher Jones
75746d60b6 Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
 2012-11-18 14:20:53 -08:00
Christopher Jones
d412152f31 Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3 
* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
 2012-11-18 14:20:49 -08:00
Pierrick Charron
99edb55e41 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Regenerate Zend ini scanner

Conflicts:
	Zend/zend_ini_scanner.c
	Zend/zend_ini_scanner_defs.h
 2012-11-16 18:24:42 -05:00
Pierrick Charron
c886691100 Regenerate Zend ini scanner 
Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h
 2012-11-16 18:16:21 -05:00
Pierrick Charron
15ab75be8a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
 2012-11-16 18:07:02 -05:00
Pierrick Charron
6dff07aa8c Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value 
Restore the old behavior but keep bug 51094 fixed
 2012-11-16 18:04:14 -05:00
Christopher Jones
975fb4e3ea Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4 
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Skip test if directory does not exist
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  UPdated NEWS
  Updated NEWS
 2012-11-15 19:29:48 -08:00
Christopher Jones
16f9f46935 Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3 
* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Skip test if directory does not exist
  Updated NEWS
 2012-11-15 19:29:44 -08:00
Johannes Schlüter
2a59f1d06c Merge branch 'PHP-5.3' into PHP-5.4 2012-11-15 12:29:38 +01:00
Johannes Schlüter
7468fc0e37 Skip test if directory does not exist 
Would be good to run this using a directory which is existing
everywhere.
 2012-11-15 12:28:19 +01:00
Anatoliy Belsky
3d82f16c7d Fixed test sapi/cli/tests/006.phpt 
Third param in preg_match_all() is optional for a while )
 2012-11-14 16:20:59 +01:00
Dmitry Stogov
f99befadbd Fixed compiler reenterability 2012-11-14 17:47:27 +04:00
Dmitry Stogov
65585b3aa2 Fixed compiler reenterability 2012-11-14 17:45:10 +04:00
Anatoliy Belsky
5a1d2fe415 UPdated NEWS 2012-11-14 10:06:46 +01:00
Anatoliy Belsky
55a4da7f53 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Updated NEWS
 2012-11-14 10:04:27 +01:00
Anatoliy Belsky
f5d8b638c7 Updated NEWS 2012-11-14 10:02:35 +01:00
Anatoliy Belsky
117d2dd688 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Enabled apache 2.4 handler build option

Conflicts:
	sapi/apache2handler/config.w32
 2012-11-13 19:40:22 +01:00
Pierre Joye
019bdff395 Enabled apache 2.4 handler build option 2012-11-13 19:34:00 +01:00
Derick Rethans
4f36aeb120 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2012-11-13 10:16:58 +00:00
Derick Rethans
00ad4c0e6a - Updated to version 2012.10 (2012j) 2012-11-13 10:15:34 +00:00
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