clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,319 Commits 494 Branches 1,367 Tags 807 MiB
c86862cb3c
Commit Graph

76319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wallner
c86862cb3c Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-src 
* 'openssl_compile_warning_fix' of https://github.com/bukka/php-src:
  Fix compiler warnings in openssl.c
 2013-10-18 12:03:02 +02:00
Michael Wallner
a03b1328b8 fix compiler warnings and type usage 2013-10-18 11:34:24 +02:00
Michael Wallner
f711c1219d Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src 
* 'ldap_escape-dev' of https://github.com/DaveRandom/php-src:
  Add ldap_escape()
 2013-10-18 11:17:41 +02:00
Xinchen Hui
d345ad211b Merge branch 'zend-documentation-fix' of https://github.com/AskDrCatcher/php-src-1 2013-10-18 10:40:44 +08:00
Xinchen Hui
065bbeb83f Merge branch 'PHP-5.5' 2013-10-18 10:34:59 +08:00
Xinchen Hui
db61685edf Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-10-18 10:34:36 +08:00
Xinchen Hui
4417421ab6 Retruning SUCCESS/FAILURE instead of int 2013-10-18 10:33:53 +08:00
ArunSK
6b90f23787 fixed typo and few grammar mistakes 2013-10-17 22:00:40 -04:00
Christopher Jones
5e368b76ed Add missing test to package.xml 2013-10-17 13:49:50 -07:00
Christopher Jones
c59d790949 Prepare for OCI8 2.0.5 release 2013-10-17 12:15:45 -07:00
Christopher Jones
cefbf932c8 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  TLS news
  previous revert killed that file
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"
  TLS news
  fix ws
  Added support for TLSv1.1 and TLSv1.2
  Added support for TLSv1.1 and TLSv1.2
 2013-10-17 09:23:15 -07:00
Christopher Jones
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
Michael Wallner
66868c8fd4 TLS news 2013-10-17 15:47:55 +02:00
Michael Wallner
b95f9fa0aa previous revert killed that file 2013-10-17 15:32:18 +02:00
Michael Wallner
3f2fba4c34 Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php-src 
* 'updated_tls_support' of https://github.com/rdlowrey/php-src:
  Added support for TLSv1.1 and TLSv1.2

Conflicts:
	ext/openssl/xp_ssl.c
 2013-10-17 15:27:15 +02:00
Michael Wallner
dd3a4c303b Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"
 2013-10-17 15:22:07 +02:00
Michael Wallner
d89d46d940 Revert "TLS news" 
This reverts commit 62be976abe.
 2013-10-17 15:21:34 +02:00
Michael Wallner
8aaecef524 Revert "Added support for TLSv1.1 and TLSv1.2" 
This reverts commit 2aaa3d538a.
 2013-10-17 15:20:38 +02:00
Michael Wallner
e6481e2393 Merge branch 'PHP-5.5' 
* PHP-5.5:
  TLS news
 2013-10-17 15:13:25 +02:00
Michael Wallner
62be976abe TLS news 2013-10-17 15:13:12 +02:00
Michael Wallner
ad0a85b9e2 fix ws 2013-10-17 15:09:28 +02:00
Michael Wallner
5a7ca69e56 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added support for TLSv1.1 and TLSv1.2

Conflicts:
	ext/openssl/xp_ssl.c
 2013-10-17 14:53:50 +02:00
Daniel Lowrey
2aaa3d538a Added support for TLSv1.1 and TLSv1.2 
Conflicts:
	ext/openssl/xp_ssl.c
 2013-10-17 14:49:44 +02:00
Christopher Jones
134caeb837 Merge branch 'master' of https://git.php.net/repository/php-src 
* 'master' of https://git.php.net/repository/php-src:
  Assume the free space is correct on Travis CI.
 2013-10-17 05:41:53 -07:00
Christopher Jones
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
Michael Wallner
bd666e2f99 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Assume the free space is correct on Travis CI.
 2013-10-17 12:12:26 +02:00
Tjerk Meesters
51b809e3ad Assume the free space is correct on Travis CI. 2013-10-17 12:12:05 +02:00
Christopher Jones
89e93bd2a2 OCI8: More test updates 2013-10-16 22:33:34 -07:00
Christopher Jones
0d909f5bfc OCI8: Mostly SKIPIF version updates to simplify version checks at the expense of not testing some edge cases with older Oracle patch set versions. 
Delete two obsolete .phpt's.
 2013-10-16 22:02:32 -07:00
Xinchen Hui
a1a7522105 Merge branch 'PHP-5.5' 2013-10-17 12:25:01 +08:00
Xinchen Hui
06994a419d Add ability of alias resolving (it cause problem while work with opcache) 2013-10-17 12:23:09 +08:00
Nikita Popov
d51553e399 Merge branch 'PHP-5.5' 2013-10-16 18:39:13 +02:00
Nikita Popov
865f221627 Merge branch 'PHP-5.4' into PHP-5.5 2013-10-16 18:37:49 +02:00
bwoebi
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
Julien Pauli
aa76f779ef 5.5.6 now 2013-10-15 16:11:11 +02:00
Paul Tarjan
a2eacd8a2c fix typo in copy_variation16 test 2013-10-14 23:54:59 -07:00
Anatol Belski
eb97d270da Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix whitespaces
 2013-10-14 17:13:30 +02:00
Anatol Belski
7e4a42c278 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix whitespaces
 2013-10-14 17:13:11 +02:00
Anatol Belski
b0a36007ab fix whitespaces 2013-10-14 17:12:32 +02:00
Anatol Belski
2a093551e7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  added notes about the PECL site conformity

Conflicts:
	README.EXTENSIONS
 2013-10-14 16:10:10 +02:00
Anatol Belski
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
Anatol Belski
9ccde8a415 added notes about the PECL site conformity 2013-10-14 16:07:26 +02:00
Anatol Belski
dcfd753104 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:37:39 +02:00
Anatol Belski
ea4ef75918 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fixed skeleton to produce the normalized ext version macros
 2013-10-14 14:34:33 +02:00
Anatol Belski
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
Anatol Belski
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
Jakub Zelenka
c092d286fc Fix compiler warnings in openssl.c 2013-10-13 15:52:39 +01:00
Felipe Pena
314a3aa9ac Merge branch 'master' of git.php.net:/php-src 2013-10-12 18:07:58 -03:00
Felipe Pena
eed5d9cc5f Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed possible memory leak
 2013-10-12 18:06:39 -03:00
Felipe Pena
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