1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Commit Graph

41934 Commits

Author SHA1 Message Date
Chad Sikorra 737ee1f2c9 Fix minor spacing issue 2016-06-26 09:31:07 -05:00
Chad Sikorra 63427c1768 Make LDAP_ESCAPE_DN compliant with RFC 4514 2016-06-25 21:16:45 -05:00
Anatol Belski 35bbcd17a9 remove unused declarations 2016-06-23 15:02:43 +02:00
Xinchen Hui 697e3bb48b Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
  typo
  Turn safe timeout handling into general interrupt handling ability.
  Fixed compilation warnings
  yet another test rewrite
  Add additional LDAP SASL constants
  Add tests for LDAP_OPT_* constants
  Add LDAP TLS Protocol Min constants
  Add tests for the LDAP CRL check option
  Add missing LDAP constants
2016-06-23 20:59:28 +08:00
Xinchen Hui eb65db0808 Use zend_sort in array_multisort (tests change is expected) 2016-06-23 20:58:45 +08:00
Dmitry Stogov adc95c5114 Fixed compilation warnings 2016-06-23 12:47:06 +03:00
Anatol Belski 4ac29543d6 Merge branch 'PHP-7.0'
* PHP-7.0:
  yet another test rewrite
2016-06-23 09:42:50 +02:00
Anatol Belski 056c2ce349 yet another test rewrite 2016-06-23 09:42:17 +02:00
Côme Bernigaud a5858ca910 Merge branch 'PHP-7.1.0'
* PHP-7.1.0:
  Add additional LDAP SASL constants
  Add tests for LDAP_OPT_* constants
  Add LDAP TLS Protocol Min constants
  Add tests for the LDAP CRL check option
  Add missing LDAP constants
2016-06-23 09:13:40 +02:00
Xinchen Hui dad500ef6a Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #72476 (Memleak in jit_stack)
2016-06-23 14:07:08 +08:00
Xinchen Hui bd74e7d013 Fixed bug #72476 (Memleak in jit_stack) 2016-06-23 14:06:48 +08:00
Côme Bernigaud 355c5954da Merge branch 'pull-request/1946' into PHP-7.1.0
* pull-request/1946:
  Add additional LDAP SASL constants
  Add tests for LDAP_OPT_* constants
  Add LDAP TLS Protocol Min constants
  Add tests for the LDAP CRL check option
  Add missing LDAP constants
2016-06-23 07:22:40 +02:00
Anatol Belski 0b0758cc31 Merge branch 'PHP-7.0'
* PHP-7.0:
  rewrite test
2016-06-22 19:47:59 +02:00
Anatol Belski 4edbac6ec5 rewrite test 2016-06-22 19:46:02 +02:00
Anatol Belski d20372cf6c Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #72463 mail fails with invalid argument
2016-06-22 19:10:57 +02:00
Anatol Belski e453904251 Fixed bug #72463 mail fails with invalid argument 2016-06-22 19:06:33 +02:00
Dmitry Stogov 6f40b01dee Regenerated html_tables.h to fix compilation warnings 2016-06-22 17:22:06 +03:00
Julien Pauli e2add3ed87 Fixed parse_url() for better compliance with RFC3986 2016-06-22 14:05:25 +02:00
Anatol Belski 9c1fba8593 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix test cleanup
2016-06-22 12:23:24 +02:00
Anatol Belski c196f9cdf7 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix test cleanup
2016-06-22 12:22:03 +02:00
Anatol Belski 4638ba9c07 fix test cleanup 2016-06-22 12:20:02 +02:00
Anatol Belski b6259fc91f Merge branch 'PHP-7.0'
* PHP-7.0:
  fix dir separator in test
2016-06-22 11:45:30 +02:00
Anatol Belski 98f6248dcf Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix dir separator in test
2016-06-22 11:44:14 +02:00
Anatol Belski de1c407348 fix dir separator in test 2016-06-22 11:41:05 +02:00
Anatol Belski 0d953f66be fix test 2016-06-22 08:41:39 +02:00
Dmitry Stogov ffef14a0a1 Fixed test according to FR #46600 ("_empty_" key in objects) 2016-06-22 00:56:56 +03:00
Dmitry Stogov 323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Dmitry Stogov 1433162083 Fixed compilation warnings 2016-06-21 20:12:29 +03:00
Dmitry Stogov ccf4ae95bd Restored signed format specifier 2016-06-21 20:12:04 +03:00
Dmitry Stogov a0df06fc4b Revert "sync tests with the latest format fixes"
This reverts commit ef7116d55b.
2016-06-21 20:10:44 +03:00
Anatol Belski ef7116d55b sync tests with the latest format fixes 2016-06-21 19:06:28 +02:00
Anatol Belski da15af8b3f fix include order 2016-06-21 18:58:11 +02:00
Anatol Belski bdd127528e Merge branch 'PHP-7.0'
* PHP-7.0:
  fix two remaining tests
2016-06-21 17:25:12 +02:00
Anatol Belski ed10168b30 fix two remaining tests 2016-06-21 17:24:08 +02:00
Anatol Belski 307e6b7ac9 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix test
2016-06-21 16:23:50 +02:00
Anatol Belski 1d5a4520be Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix test
2016-06-21 16:22:51 +02:00
Anatol Belski e3bd360ec9 fix test
There is a difference between TS and NTS warning message, since
virtual_mkdir vs glibc directly is used. This has no effect for
the actual fix functionality.
2016-06-21 16:20:03 +02:00
Anatol Belski 166a2288ee Merge branch 'PHP-7.0'
* PHP-7.0:
  re-fix leak
  re-fix leak
  Revert "fix leak"
2016-06-21 15:22:31 +02:00
Anatol Belski 5a9f0c77ad re-fix leak 2016-06-21 15:21:58 +02:00
Anatol Belski a00350486f re-fix leak 2016-06-21 15:18:10 +02:00
Anatol Belski 4fcf7683db Merge branch 'master' of git.php.net:php-src 2016-06-21 15:14:22 +02:00
Dmitry Stogov 1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Anatol Belski f74c88e945 Merge branch 'PHP-7.0'
* PHP-7.0:
  Revert "fix leak"
2016-06-21 14:59:56 +02:00
Anatol Belski 9a9249a8d0 Revert "fix leak"
This reverts commit 757105e2a2.
2016-06-21 14:58:15 +02:00
Anatol Belski e6cc30e167 Revert "fix leak"
This reverts commit c5d9c50897.
2016-06-21 14:51:43 +02:00
Anatol Belski 67e23f4be3 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix leak
  fix leak
2016-06-21 13:27:09 +02:00
Anatol Belski 757105e2a2 fix leak 2016-06-21 13:26:12 +02:00
Anatol Belski c5d9c50897 fix leak 2016-06-21 12:29:41 +02:00
Remi Collet 8726de48c8 Merge branch 'PHP-7.0'
* PHP-7.0:
  bump zip version
2016-06-21 11:17:08 +02:00
Remi Collet 69fd1133d0 bump zip version 2016-06-21 11:16:21 +02:00