clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,329 Commits 494 Branches 1,367 Tags 801 MiB
a48e2bad62
Commit Graph

75329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
a48e2bad62 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-22 11:03:10 +02:00
Andrey Hristov
a047ece2e0 Disable a flag 2013-07-22 11:02:48 +02:00
Stanislav Malyshev
4467ada680 Merge branch 'pull-request/326' 
* pull-request/326:
  zend_register_null_constant fixed zend_register_bool_constant usage in macros use REGISTER_MAIN_* in zend_register_standard_constants
  zend_API.h included ZVAL_* family in use
  use Z_* family macros
  zend_register_bool_constant patch
 2013-07-21 23:19:33 -07:00
Stanislav Malyshev
8d2651d8fc Merge branch 'PHP-5.5' 
* PHP-5.5:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
 2013-07-21 23:15:03 -07:00
Stanislav Malyshev
b8d4a6939e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
 2013-07-21 23:14:42 -07:00
Yoshinari Takaoka
1b4103c09d - addressed bug #65159, Misleading configure help text for --with-mysql-sock 2013-07-21 23:12:54 -07:00
Stanislav Malyshev
46cc826770 Merge branch 'pull-request/231' 
* pull-request/231:
  update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
  fix for scrolling, other minor tweaks
  Bump up table width a bit more and make columns consistent
  Bringing CSS up to this decade's standards.
 2013-07-21 22:49:26 -07:00
Stanislav Malyshev
e68cd521dc Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
 2013-07-21 22:48:03 -07:00
Stanislav Malyshev
83ced9124e Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly 2013-07-21 22:47:10 -07:00
Stanislav Malyshev
3cbb48f055 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
 2013-07-21 22:31:37 -07:00
Stanislav Malyshev
476924ec3d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
 2013-07-21 22:31:19 -07:00
Stanislav Malyshev
ba984582db Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix 2013-07-21 22:28:02 -07:00
Andrey
da3886de6d Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT 2013-07-21 22:25:21 -07:00
Stanislav Malyshev
10c547018f Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added recursivetreeiterator::setPostfix() method
 2013-07-21 22:22:02 -07:00
Joshua Thijssen
5027fa79d7 Added recursivetreeiterator::setPostfix() method 2013-07-21 22:20:58 -07:00
Stanislav Malyshev
1a05648e6d Merge branch 'PHP-5.5' 
* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix

Conflicts:
	configure.in
	main/php_version.h
 2013-07-21 21:17:59 -07:00
Stanislav Malyshev
2c23004a1e next is 5.5.2 2013-07-21 21:16:39 -07:00
Veres Lajos
e7a00a2566 add a few comment 2013-07-21 21:14:38 -07:00
Lajos Veres
f51b8d8820 allow both the old and new cfg argument to work. (the old of course should contain the typo) 2013-07-21 21:12:19 -07:00
Veres Lajos
b8941a73cc mssql.compatability_mode fix 2013-07-21 21:12:16 -07:00
Stanislav Malyshev
02457554a3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
 2013-07-21 20:10:31 -07:00
Lajos Veres
97637b2a4c backward compatibility 2013-07-21 20:09:59 -07:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Xinchen Hui
a522f2d1c9 Merge branch 'PHP-5.5' 2013-07-21 21:07:50 +08:00
Xinchen Hui
29281dee49 Update NEWS 2013-07-21 21:07:38 +08:00
Xinchen Hui
c7b58e4967 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-21 21:07:27 +08:00
Xinchen Hui
3380de9774 Fixed bug #65304 (Use of max int in array_sum) 2013-07-21 21:07:19 +08:00
Xinchen Hui
25eb44fcc1 Merge branch 'PHP-5.5' 2013-07-21 16:20:00 +08:00
Xinchen Hui
3cd13204bb Updaet NEWS 2013-07-21 16:19:40 +08:00
Xinchen Hui
629965abe2 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-21 16:19:13 +08:00
Xinchen Hui
cc91fbe986 Reorder NEWS 2013-07-21 15:58:10 +08:00
Gustavo André dos Santos Lopes
cbd1faf077 Merge branch 'PHP-5.5' 
* PHP-5.5:
  intl: remove extra quotes from arginfo params
 2013-07-21 03:30:42 +02:00
Gustavo André dos Santos Lopes
3363e04fb4 intl: remove extra quotes from arginfo params 2013-07-21 03:30:28 +02:00
Rui Hirokawa
cb607d4f78 updated test script for bug #65045. 2013-07-21 10:18:33 +09:00
Arpad Ray
b963249456 Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait 
Also fix and test for get_defined_constants(true)
 2013-07-20 11:05:13 +01:00
Johannes Schlüter
7daf1a6c14 Mention git and suggest PECL for new things 2013-07-19 22:05:52 +02:00
Johannes Schlüter
b278aba429 Update patch submitting instructions 
- we use git
- pecl bugs were merged into bugs.php.net
- A bit less on PEAR
 2013-07-19 22:00:01 +02:00
Johannes Schlüter
17361b9707 Remove README about PHP 4.0 -> 4.1 API changes 2013-07-19 21:45:26 +02:00
Arpad Ray
a015fa83a7 Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait 2013-07-19 19:19:48 +01:00
Matteo Beccati
85bbc8fa9d Merge branch 'PHP-5.5' 
* PHP-5.5:
  Properly fixed bug #63186 on NetBSD == 6.0
 2013-07-19 09:40:15 +02:00
Matteo Beccati
1dc7d0da08 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Properly fixed bug #63186 on NetBSD == 6.0
 2013-07-19 09:39:53 +02:00
Matteo Beccati
2b9d42433f Properly fixed bug #63186 on NetBSD == 6.0 2013-07-19 09:37:39 +02:00
Anatol Belski
1673e8f67e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #65268 select() implementation uses outdated tick API
 2013-07-18 18:02:26 +02:00
Anatol Belski
99afc6dc11 Fixed bug #65268 select() implementation uses outdated tick API 2013-07-18 18:01:51 +02:00
Anatol Belski
c6651942ce Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix header include
  new NEWS for next release
 2013-07-18 15:29:17 +02:00
Anatol Belski
d8dd4d9b02 fix header include 
stddef.h is needed to have offsetof macros on windows (at least)
 2013-07-18 15:28:20 +02:00
Julien Pauli
cbdf9edebd new NEWS for next release 2013-07-18 11:54:09 +02:00
Julien Pauli
c8befa4f7c Merge branch 'PHP-5.5' 2013-07-18 11:12:01 +02:00
Julien Pauli
53a7e00911 New NEWS 2013-07-18 10:22:57 +02:00
Yasuo Ohgaki
0a7c88884e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Improve php.ini-* documentation
 2013-07-18 14:10:34 +09:00