clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,529 Commits 494 Branches 1,367 Tags 881 MiB
8a985edfb2
Commit Graph

34124 Commits

Author SHA1 Message Date
Anatol Belski
8a985edfb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
 2014-04-16 14:16:56 +02:00
Anatol Belski
801d312507 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
 2014-04-16 14:15:52 +02:00
Anatol Belski
444690eca8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
 2014-04-16 14:14:52 +02:00
Anatol Belski
5224614f23 Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset 2014-04-16 14:13:45 +02:00
Anatol Belski
b7d376c1e5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute
 2014-04-15 10:29:32 -07:00
Anatol Belski
aaf197180a Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute 2014-04-15 10:26:49 -07:00
Stanislav Malyshev
0ae2328c44 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test - doesn't seem to produce warning
  Fix test - on CI somebody could create a process in the meantime
 2014-04-14 15:48:33 -07:00
Stanislav Malyshev
bfbb409b32 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix test - on CI somebody could create a process in the meantime
 2014-04-14 15:47:53 -07:00
Stanislav Malyshev
173cd183c9 fix test - doesn't seem to produce warning 2014-04-14 15:47:06 -07:00
Stanislav Malyshev
b727934591 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix test - on CI somebody could create a process in the meantime
 2014-04-14 15:45:53 -07:00
Stanislav Malyshev
eea75e7146 Fix test - on CI somebody could create a process in the meantime 2014-04-14 15:44:23 -07:00
Anatol Belski
46070e956c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix windows build
 2014-04-14 23:35:51 +02:00
Anatol Belski
634e6b61d9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix windows build
 2014-04-14 23:34:50 +02:00
Anatol Belski
793f67e852 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix windows build
 2014-04-14 23:30:14 +02:00
Anatol Belski
24b72e7a27 fix windows build 2014-04-14 23:29:38 +02:00
Chuan Ma
8d05a777ad Fix #66942: openssl_seal() memory leak 
Fix #66952: memory leak in openssl_open()
 2014-04-14 13:38:32 -07:00
Stanislav Malyshev
fae8ed8ae9 ws fix 2014-04-14 13:37:58 -07:00
Chuan Ma
f413a77b3d Fix #66942: openssl_seal() memory leak 
Fix #66952: memory leak in openssl_open()
 2014-04-14 13:36:17 -07:00
Stanislav Malyshev
99b01fb3d7 ws fix 2014-04-14 13:35:59 -07:00
Stanislav Malyshev
8bc82718ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66942: openssl_seal() memory leak
  ws fix

Conflicts:
	ext/openssl/openssl.c
 2014-04-14 13:35:24 -07:00
Chuan Ma
a186312832 Fix #66942: openssl_seal() memory leak 
Fix #66952: memory leak in openssl_open()
 2014-04-14 13:24:14 -07:00
Stanislav Malyshev
56f9727305 ws fix 2014-04-14 13:16:53 -07:00
Andrey Hristov
22acea99ff Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2014-04-14 23:11:29 +03:00
Andrey Hristov
84fcc44083 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-04-14 23:11:16 +03:00
Andrey Hristov
f1c70fbbd6 Merge branch 'master' of git.php.net:php-src 2014-04-14 23:11:01 +03:00
Stanislav Malyshev
9af0756dd5 Fix null byte in LDAP bindings 2014-04-14 10:53:08 -07:00
Stanislav Malyshev
fb96a62b7d Fix bug #66171: better handling of symlinks 2014-04-14 10:53:07 -07:00
Stanislav Malyshev
59900dd37f Fix null byte in LDAP bindings 2014-04-14 10:51:32 -07:00
Stanislav Malyshev
41569b1029 Fix bug #66171: better handling of symlinks 2014-04-14 10:51:31 -07:00
Stanislav Malyshev
ed4de188dd Fix null byte in LDAP bindings 2014-04-14 10:46:46 -07:00
Stanislav Malyshev
7f43aeb167 Fix bug #66171: better handling of symlinks 2014-04-14 10:46:45 -07:00
Stanislav Malyshev
ad1b9eef98 Fix null byte in LDAP bindings 2014-04-14 10:44:53 -07:00
Stanislav Malyshev
40a9316dff Fix bug #66171: better handling of symlinks 2014-04-14 10:44:53 -07:00
Anatol Belski
a35723f6e1 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix crash in MINFO when no mysqlnd plugins are loaded
 2014-04-14 17:45:18 +02:00
Anatol Belski
9e76e87ca9 fix crash in MINFO when no mysqlnd plugins are loaded 2014-04-14 17:44:47 +02:00
Andrey Hristov
0705bfc3a3 Merge branch 'PHP-5.6' 2014-04-14 17:44:21 +03:00
Andrey Hristov
ce99f292de Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/mysqli/tests/mysqli_change_user_old.phpt
 2014-04-14 17:44:13 +03:00
Andrey Hristov
dae70a2ff7 Add test 2014-04-14 17:35:01 +03:00
Anatol Belski
f6db1057fd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  backported some ext/intl tests from 5.6 into 5.4

Conflicts:
	ext/intl/tests/collator_get_sort_key_variant2.phpt
	ext/intl/tests/locale_get_display_name3.phpt
 2014-04-14 16:34:08 +02:00
Anatol Belski
4268504084 backported some ext/intl tests from 5.6 into 5.4 2014-04-14 16:31:18 +02:00
Anatol Belski
333af6fe34 Merge branch 'PHP-5.6' 
* PHP-5.6:
  test fixes for ICU 53.1
 2014-04-14 15:35:01 +02:00
Anatol Belski
d483e1daca test fixes for ICU 53.1 2014-04-14 15:34:32 +02:00
Stanislav Malyshev
3970b9d7dd Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:56:26 -07:00
Stanislav Malyshev
7c9209a0d1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:56:16 -07:00
Stanislav Malyshev
9bba219c75 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:55:28 -07:00
Stanislav Malyshev
5e66ce9293 Merge branch 'pull-request/518' into PHP-5.4 
* pull-request/518:
  Fix #66021 (Blank line inside empty array/object)
 2014-04-13 18:50:39 -07:00
Stanislav Malyshev
0a13f8168d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #64604
 2014-04-13 18:39:28 -07:00
Stanislav Malyshev
0d4c28f2e1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #64604
 2014-04-13 18:39:17 -07:00
Stanislav Malyshev
30ec1c0051 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64604
 2014-04-13 18:38:36 -07:00
Ingo Walz
b05c088a3a Fixed bug #64604 2014-04-13 18:37:40 -07:00