php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-19 14:01:01 +02:00
Code Issues Packages Projects Releases Wiki Activity
78,533 Commits 547 Branches 1,483 Tags
bf0d383aba1e2353e4e8029d8efabff570f3ff1f
Commit Graph

78533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
bf0d383aba fix tests for ICU >= 52.1 2014-02-05 19:25:33 +01:00
Hannes Magnusson
7d62a321c7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix year
 2014-02-05 10:18:10 -08:00
Hannes Magnusson
ae310e078d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix year
 2014-02-05 10:17:49 -08:00
Hannes Magnusson
b855367551 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix year
 2014-02-05 10:15:50 -08:00
Hannes Magnusson
1e0fdf0256 Fix year 2014-02-05 10:15:11 -08:00
Anatol Belski
b35c788a62 Merge branch 'PHP-5.6' 
* PHP-5.6:
  adapt test to curl 7.35.0 upgrade
 2014-02-05 15:17:48 +01:00
Anatol Belski
5180425ca9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  adapt test to curl 7.35.0 upgrade
 2014-02-05 15:17:30 +01:00
Anatol Belski
fd87b38c47 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  adapt test to curl 7.35.0 upgrade
 2014-02-05 15:16:57 +01:00
Anatol Belski
71ebc0a7f3 adapt test to curl 7.35.0 upgrade 
which is a security one and should be performed as in
http://curl.haxx.se/docs/adv_20140129.html
 2014-02-05 15:15:34 +01:00
Anatol Belski
ff390d788f Merge branch 'PHP-5.6' 
* PHP-5.6:
  move the NEWS entry into the right section
 2014-02-05 10:52:17 +01:00
Anatol Belski
3c1ba1f263 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  move the NEWS entry into the right section
 2014-02-05 10:52:00 +01:00
Anatol Belski
918f626d97 move the NEWS entry into the right section 2014-02-05 10:51:08 +01:00
Daniel Lowrey
6c1cdd0814 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed SNI failure from missing Z_STRVAL_PP
 2014-02-04 19:13:50 -07:00
Daniel Lowrey
99fa59054d Fixed SNI failure from missing Z_STRVAL_PP 2014-02-04 19:11:56 -07:00
Anatol Belski
60846fab58 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
 2014-02-04 10:39:46 +01:00
Anatol Belski
78815f9034 updated NEWS 2014-02-04 10:39:18 +01:00
Anatol Belski
b052ae9292 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
 2014-02-04 10:38:46 +01:00
Anatol Belski
465d5db693 updated NEWS 2014-02-04 10:38:17 +01:00
Anatol Belski
f27eaa1578 Merge branch 'PHP-5.6' 
* PHP-5.6:
  pcre tests go with 8.34 upgrade
 2014-02-04 10:35:19 +01:00
Anatol Belski
f2d42e1624 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  pcre tests go with 8.34 upgrade
 2014-02-04 10:34:51 +01:00
Anatol Belski
ab32d36ec6 pcre tests go with 8.34 upgrade 2014-02-04 10:34:11 +01:00
Anatol Belski
2e8e2db82a Merge branch 'PHP-5.6' 
* PHP-5.6:
  pcre upgraded to 8.34
 2014-02-04 10:32:09 +01:00
Anatol Belski
353e2643ab Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  pcre upgraded to 8.34
 2014-02-04 10:31:52 +01:00
Anatol Belski
23cb7bd506 pcre upgraded to 8.34 2014-02-04 10:31:07 +01:00
Ferenc Kovacs
0e764dc657 Merge branch 'PHP-5.6' 2014-02-03 04:21:27 +01:00
Ferenc Kovacs
5d3a2fde24 mention the openssl SPKAC functions commited to master before branching out 5.6. see https://github.com/php/php-src/pull/267 2014-02-03 04:20:16 +01:00
krakjoe
6597d86389 Merge branch 'PHP-5.6' 
* PHP-5.6:
  windows
 2014-02-02 15:14:53 +00:00
krakjoe
148d7cc103 windows 2014-02-02 15:14:25 +00:00
krakjoe
eacab735e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  clean symbols
 2014-02-02 15:10:28 +00:00
krakjoe
407d761d09 clean symbols 2014-02-02 15:10:17 +00:00
krakjoe
8aaec7d1c3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  another patch from upstream
 2014-02-02 14:59:30 +00:00
krakjoe
e8519bc207 another patch from upstream 2014-02-02 14:58:39 +00:00
krakjoe
202dcc0f6a Merge branch 'PHP-5.6' 
* PHP-5.6:
  woops
 2014-02-02 14:50:43 +00:00
krakjoe
6a6bec44ad woops 2014-02-02 14:50:32 +00:00
krakjoe
ee42849f8f Merge branch 'PHP-5.6' 
* PHP-5.6:
  better use of tmpnam/mkstemp
 2014-02-02 14:42:54 +00:00
krakjoe
9e84124e2d better use of tmpnam/mkstemp 2014-02-02 14:42:31 +00:00
krakjoe
37f4f132fc Merge branch 'PHP-5.6' 
* PHP-5.6:
  update version
 2014-02-02 14:05:03 +00:00
krakjoe
4a96a75c7d update version 2014-02-02 14:04:47 +00:00
krakjoe
4c6816ddf2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  remove use of zend directly, avoid leaks/bugs in modules etc
 2014-02-02 13:51:05 +00:00
krakjoe
dc02b5a1fd Merge branch 'master' of https://git.php.net/repository/php-src 2014-02-02 13:50:54 +00:00
krakjoe
a58c74f1c7 remove use of zend directly, avoid leaks/bugs in modules etc 2014-02-02 13:43:43 +00:00
krakjoe
a4a120d66a Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-02-02 13:42:01 +00:00
Daniel Lowrey
f08e8772a7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Remove #if PHP_VERSION_ID version checks

Conflicts:
	ext/openssl/xp_ssl.c
 2014-02-01 08:25:01 -07:00
Daniel Lowrey
0893a13e32 Remove #if PHP_VERSION_ID version checks 2014-02-01 08:13:53 -07:00
Daniel Lowrey
05c309f2d8 Remove #if PHP_VERSION_ID version checks 2014-02-01 08:01:13 -07:00
Daniel Lowrey
f197dafd1c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use master-agnostic zend_is_true checks

Conflicts:
	ext/openssl/xp_ssl.c
 2014-01-31 14:22:35 -07:00
Daniel Lowrey
58293fb533 Use master-agnostic zend_is_true checks 2014-01-31 14:18:31 -07:00
Anatol Belski
5ed1bdf9a5 fix ZTS build 2014-01-30 10:47:58 +01:00
Stanislav Malyshev
11e47b1cdc Merge branch 'PHP-5.6' 
* PHP-5.6:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
 2014-01-29 23:48:44 -08:00
Stanislav Malyshev
d76a6a3e4d tests still failing, so xfail for now until fixed 2014-01-29 23:48:44 -08:00