14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
68e8326e0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
non living code related typo fixes
2013-08-04 16:07:13 -07:00
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
55d335fa95
Merge branch 'PHP-5.5'
2013-08-02 18:43:17 +08:00
47ac4f8670
Fixed tests (inet_pton behaves differently on Darwin)
2013-08-02 18:43:08 +08:00
92d27ccb05
Constify streams API and a few other calls down the rabbit hole.
...
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
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
02457554a3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:10:31 -07:00
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
a522f2d1c9
Merge branch 'PHP-5.5'
2013-07-21 21:07:50 +08:00
c7b58e4967
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 21:07:27 +08:00
3380de9774
Fixed bug #65304 (Use of max int in array_sum)
2013-07-21 21:07:19 +08:00
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
31edf4df56
regenerate url scanner
2013-07-17 16:28:01 +01:00
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
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
12aec9ec8e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
added sapi check for dl() test
2013-07-16 15:43:59 +02:00
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
135f81c5ae
added sapi check for dl() test
2013-07-16 15:42:38 +02:00
2c73ce4363
revert false fix
2013-07-15 00:23:17 -07:00
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
b79b13b4ef
less serious compatAbility fixes
2013-07-15 00:21:39 -07:00
c2088f8b81
revert false fix
2013-07-15 00:19:56 -07:00
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
d17e8ac32f
less serious compatAbility fixes
2013-07-15 00:19:39 -07:00
f23a5fbc8e
revert false fix
2013-07-15 00:19:07 -07:00
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
227556c6a2
less serious compatAbility fixes
2013-07-15 00:17:35 -07:00
14b67ed6da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix uninitialized memory usage
2013-07-14 20:46:48 +02:00
168a5bb6df
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix uninitialized memory usage
2013-07-14 20:46:19 +02:00
add0833681
fix uninitialized memory usage
2013-07-14 20:44:29 +02:00
ecf057d197
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:49:41 +02:00
2acc386270
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:48:12 +02:00
95017c0522
Add a couple more test cases to parse_url() tests
...
http://::# (valid but silly)
http://# (invalid)
2013-07-10 08:26:47 -07:00
ecb55dd9f5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:52:08 +02:00
870d238b06
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added warning for hex2bin() when input is invalid string
Update NEWS
2013-07-08 19:15:04 +09:00
bde0f1318a
Added warning for hex2bin() when input is invalid string
2013-07-08 19:14:45 +09:00
11b757d53e
Merge branch 'PHP-5.5'
2013-07-08 11:21:54 +08:00
d1c261d7f8
array_column: Changing integer in test output to use %d
2013-07-06 20:50:34 +00:00
c743d0c9dc
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed test
2013-06-26 13:36:50 -03:00
32f11e4ee6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed test
2013-06-26 13:36:41 -03:00
f477ad22c2
- Fixed test
2013-06-26 13:36:36 -03:00
793694b9d8
Merge branch 'PHP-5.5'
2013-06-26 16:51:42 +02:00
781be5f1d7
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-06-26 16:50:08 +02:00
b34e8d2e3e
add new test
2013-06-26 16:44:26 +02:00
f0823ac493
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
2013-06-25 18:00:47 -03:00
adb116dd48
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
- BFN
2013-06-25 18:00:42 -03:00
41b73e4cee
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 18:00:33 -03:00
c1b8fbc112
Update credits
2013-06-19 22:03:18 +02:00
Michael Wallner