Commit Graph

75298 Commits

Author SHA1 Message Date
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
Yasuo Ohgaki
d6692514f8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Improve php.ini-* documentation
2013-07-18 14:10:05 +09:00
Yasuo Ohgaki
445dffa75a Improve php.ini-* documentation 2013-07-18 14:08:28 +09:00
Johannes Schlüter
2a13fb106d Remove PHP3 conversion scripts 2013-07-17 23:32:23 +02:00
Johannes Schlüter
57c50f8fed Drop PHP 4 related README 2013-07-17 23:25:44 +02:00
Johannes Schlüter
f7e204d7ed Slightly modernize ext_skel and sekelton/
- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility
2013-07-17 23:18:13 +02:00
Stanislav Malyshev
a5d177cbc8 Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.19 is next
2013-07-17 13:52:39 -07:00
Stanislav Malyshev
fec93992de Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  5.4.19 is next

Conflicts:
	configure.in
	main/php_version.h
2013-07-17 13:52:25 -07:00
Stanislav Malyshev
b9e3f737d9 5.4.19 is next 2013-07-17 13:51:15 -07:00
Arpad Ray
b594949144 Merge branch 'PHP-5.5'
* PHP-5.5:
  regenerate url scanner
  Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:28:12 +01:00
Arpad Ray
31edf4df56 regenerate url scanner 2013-07-17 16:28:01 +01:00
Arpad Ray
94ab37f06a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:19:53 +01:00
Arpad Ray
e6ae977082 Fixed bug #50308 - session id not appended properly for empty anchor tags
The issue was actually because a lack of space before a "/" marking the tag
as empty. This was being swallowed in the rule for unquoted values. Fixed
by making that rule exclude quotes (as per spec anyway).
2013-07-17 16:07:26 +01:00
Arpad Ray
fb53871d94 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62129 - rfc1867 crashes php even though turned off
2013-07-17 11:09:37 +01:00
Arpad Ray
0d3d739bf7 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #62129 - rfc1867 crashes php even though turned off
2013-07-17 11:05:23 +01:00
Arpad Ray
ba3234888d Fix bug #62129 - rfc1867 crashes php even though turned off
Patch by gxd305 at gmail dot com
2013-07-17 11:02:48 +01:00
Stanislav Malyshev
5c0ad4c72c Merge branch 'PHP-5.5'
* PHP-5.5:
  add news for xml fix
2013-07-16 15:40:20 -07:00
Stanislav Malyshev
c855f44737 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add news for xml fix
2013-07-16 15:39:16 -07:00
Stanislav Malyshev
eb8c15b573 add news for xml fix 2013-07-16 15:38:37 -07:00
Anatol Belski
be721d5d8b Merge branch 'PHP-5.5'
* PHP-5.5:
  fix TS build
2013-07-16 18:06:05 +02:00
Anatol Belski
fd5cdf89a8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix TS build
2013-07-16 18:05:45 +02:00
Anatol Belski
bb6d74918e fix TS build 2013-07-16 18:05:14 +02:00
Anatol Belski
12aec9ec8e Merge branch 'PHP-5.5'
* PHP-5.5:
  added sapi check for dl() test
2013-07-16 15:43:59 +02:00
Anatol Belski
f37ac6f591 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  added sapi check for dl() test
2013-07-16 15:43:37 +02:00