8aa19c9fd8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Moved NULL check before dereferencing
2013-10-20 09:50:13 -02:00
9976b5cd7f
- Moved NULL check before dereferencing
2013-10-20 09:50:11 -02:00
5b0560efc3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible NULL ptr dereference
2013-10-20 09:04:27 -02:00
52555a7894
- Fixed possible NULL ptr dereference
2013-10-20 09:04:24 -02:00
b6feabc8c6
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2013-10-20 08:52:31 -02:00
df31eb8fdc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
2013-10-20 08:51:17 -02:00
33d377e701
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
2013-10-20 08:51:09 -02:00
683a7d719b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove senseless check here
2013-10-19 20:56:01 -07:00
fb38fdc7fd
Remove senseless check here
2013-10-19 20:55:02 -07:00
0d6247f968
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fix extern declaration according to definition
2013-10-20 01:16:10 -02:00
a1daebefda
- Fix extern declaration according to definition
2013-10-20 01:16:07 -02:00
8d22c23161
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fix possible memory leak
2013-10-20 01:05:00 -02:00
420068c6e1
- Fix possible memory leak
2013-10-20 01:04:55 -02:00
0b5c2887cd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Moved allocation to if block to make Coverity happy
2013-10-19 23:36:36 -03:00
85a622e42f
- Moved allocation to if block to make Coverity happy
2013-10-19 23:36:28 -03:00
c1f22176f3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible memory leak
2013-10-19 23:30:12 -03:00
aa4f9b322b
- Fixed possible memory leak
2013-10-19 23:29:34 -03:00
1ce00048fd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix unitialized opened_path here - found by Coverity
2013-10-19 19:25:25 -07:00
2be67ca457
Fix unitialized opened_path here - found by Coverity
2013-10-19 19:24:17 -07:00
4a205092f7
Trivial Coverity fix
2013-10-19 17:55:34 -07:00
26b27767a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Initialize these to make Coverity happy
Typo fix: managment -> management
Use minus sign instead of hyphen
Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 17:41:04 -07:00
813e867652
Initialize these to make Coverity happy
2013-10-19 17:37:59 -07:00
a55d3b9295
Typo fix: managment -> management
2013-10-19 23:53:23 +03:00
df501fd464
Use minus sign instead of hyphen
2013-10-19 23:52:43 +03:00
d42fa2a059
Revert "Need a way to check whether this API exists"
...
hmm, we can check whether the head file exists instead
This reverts commit 4d7d85640d
2013-10-19 22:18:37 +08:00
4d7d85640d
Need a way to check whether this API exists
2013-10-19 22:16:31 +08:00
55b16f40a2
Merge branch 'pull-request/499'
...
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:43:21 -07:00
6919d15a2e
Merge branch 'pull-request/499'
...
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:42:53 -07:00
30d64b0efb
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-19 13:27:36 +08:00
1fe1f7305b
use $YACC instead of 'bison' as suggested by Yasuo
...
Conflicts:
Zend/acinclude.m4
2013-10-19 13:27:24 +08:00
db61685edf
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2013-10-18 10:34:36 +08:00
4417421ab6
Retruning SUCCESS/FAILURE instead of int
2013-10-18 10:33:53 +08:00
a4b4477466
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
TLS news
Added support for TLSv1.1 and TLSv1.2
2013-10-17 09:21:39 -07:00
d89d46d940
Revert "TLS news"
...
This reverts commit 62be976abe
2013-10-17 15:21:34 +02:00
8aaecef524
Revert "Added support for TLSv1.1 and TLSv1.2"
...
This reverts commit 2aaa3d538a
2013-10-17 15:20:38 +02:00
62be976abe
TLS news
2013-10-17 15:13:12 +02:00
2aaa3d538a
Added support for TLSv1.1 and TLSv1.2
...
Conflicts:
ext/openssl/xp_ssl.c
2013-10-17 14:49:44 +02:00
4628c9b375
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
...
* 'PHP-5.5' of https://git.php.net/repository/php-src :
Assume the free space is correct on Travis CI.
2013-10-17 05:40:57 -07:00
51b809e3ad
Assume the free space is correct on Travis CI.
2013-10-17 12:12:05 +02:00
06994a419d
Add ability of alias resolving (it cause problem while work with opcache)
2013-10-17 12:23:09 +08:00
865f221627
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-16 18:37:49 +02:00
4c0bb6d76e
Fixed bug #65911 ($this not usable as static property)
...
In context of static accesses like classname::$this, the string
"$this" should not be handled like a $this variable, but as an
identifier for a static variable.
2013-10-16 18:33:14 +02:00
aa76f779ef
5.5.6 now
2013-10-15 16:11:11 +02:00
7e4a42c278
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix whitespaces
2013-10-14 17:13:11 +02:00
b0a36007ab
fix whitespaces
2013-10-14 17:12:32 +02:00
78cbe9aed5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added notes about the PECL site conformity
2013-10-14 16:08:21 +02:00
9ccde8a415
added notes about the PECL site conformity
2013-10-14 16:07:26 +02:00
2c9fc139fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed skeleton to produce the normalized ext version macros
2013-10-14 14:21:46 +02:00
7a038ccbe6
fixed skeleton to produce the normalized ext version macros
...
See http://news.php.net/php.pecl.dev/11191 for more info.
2013-10-14 14:18:43 +02:00
62a8305007
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible memory leak
2013-10-12 18:06:27 -03:00
Felipe Pena